MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-26 22:23:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

use newDynamicTimeoutWithOpts() when appropriate (#16266)

Browse Source
This commit is contained in:
Harshavardhana 2022-12-15 13:11:37 -08:00 committed by GitHub
parent 988a2e8fed
commit 80fc3a8a52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/server-main.go
View File

@ -357,9 +357,11 @@ func initServer(ctx context.Context, newObject ObjectLayer) error {
r := rand.New(rand.NewSource(time.Now().UnixNano())) r := rand.New(rand.NewSource(time.Now().UnixNano()))
lockTimeout := newDynamicTimeout(5*time.Second, 3*time.Second) lockTimeout := newDynamicTimeoutWithOpts(dynamicTimeoutOpts{
// do not retry to avoid high contention on startup. timeout: 5 * time.Second,
lockTimeout.retryInterval = -1 minimum: 3 * time.Second,
retryInterval: -1, // do not retry to avoid high contention on startup.
})
// Do an initial random sleep to avoid stampeding herd of initial // Do an initial random sleep to avoid stampeding herd of initial
// lock request. This will spread locks requests over 1 second. // lock request. This will spread locks requests over 1 second.

4
internal/dsync/drwmutex.go
View File

@ -38,11 +38,11 @@ var lockRetryInterval time.Duration
func init() { func init() {
// Check for MINIO_DSYNC_TRACE env variable, if set logging will be enabled for failed REST operations. // Check for MINIO_DSYNC_TRACE env variable, if set logging will be enabled for failed REST operations.
dsyncLog = os.Getenv("MINIO_DSYNC_TRACE") == "1" dsyncLog = os.Getenv("_MINIO_DSYNC_TRACE") == "1"
// lockRetryInterval specifies the maximum time between retries for failed locks. // lockRetryInterval specifies the maximum time between retries for failed locks.
// Average retry time will be value / 2. // Average retry time will be value / 2.
lockRetryInterval = 100 * time.Millisecond lockRetryInterval = 250 * time.Millisecond
if lri := os.Getenv("_MINIO_LOCK_RETRY_INTERVAL"); lri != "" { if lri := os.Getenv("_MINIO_LOCK_RETRY_INTERVAL"); lri != "" {
v, err := strconv.Atoi(lri) v, err := strconv.Atoi(lri)
if err != nil { if err != nil {