[config change] add configurable cold-GET conflict timeout

alex-aizman · alex-aizman · commit 25072298b14d · 2025-05-20T12:42:34.000-04:00
* new knob: `timeout.cold_get_conflict` (default 5s) * part two, prev. commit: aa7c05e Signed-off-by: Alex Aizman <alex.aizman@gmail.com>
diff --git a/ais/tgtobj.go b/ais/tgtobj.go
@@ -2026,10 +2026,7 @@ func (t *target) putMirror(lom *core.LOM) {
 const uplockWarn = "conflict getting remote"
 
 func (goi *getOI) uplock(c *cmn.Config) (u *_uplock) {
-	const (
-		retries = 5
-	)
-	u = &_uplock{sleep: time.Second}
+	u = &_uplock{sleep: cmn.ColdGetConflictMin}
 	// jitter
 	switch goi.ltime & 0x3 {
 	case 0:
@@ -2041,7 +2038,7 @@ func (goi *getOI) uplock(c *cmn.Config) (u *_uplock) {
 	case 0x3:
 		u.sleep -= 3 * time.Millisecond
 	}
-	u.timeout = max(retries*u.sleep, c.Timeout.MaxKeepalive.D())
+	u.timeout = cos.NonZero(c.Timeout.ColdGetConflict.D(), cmn.ColdGetConflictDflt)
 	return u
 }
 
diff --git a/cmn/config.go b/cmn/config.go
@@ -301,6 +301,8 @@ type (
 		EcStreams cos.Duration `json:"ec_streams_time,omitempty"`
 		// object metadata timeout; for training apps an approx. duration of 2 (two) epochs
 		ObjectMD cos.Duration `json:"object_md,omitempty"`
+		// prior to returning 409 conflict (ie., cmn.ErrBusy)
+		ColdGetConflict cos.Duration `json:"cold_get_conflict,omitempty"`
 	}
 	TimeoutConfToSet struct {
 		CplaneOperation *cos.Duration `json:"cplane_operation,omitempty"`
@@ -311,6 +313,7 @@ type (
 		SendFile        *cos.Duration `json:"send_file_time,omitempty"`
 		EcStreams       *cos.Duration `json:"ec_streams_time,omitempty"`
 		ObjectMD        *cos.Duration `json:"object_md,omitempty"`
+		ColdGetConflict *cos.Duration `json:"cold_get_conflict,omitempty"`
 	}
 
 	ClientConf struct {
@@ -1816,6 +1819,9 @@ const (
 	LcacheEvictDflt = 2 * time.Hour
 	LcacheEvictMax  = 16 * time.Hour
 
+	ColdGetConflictDflt = 5 * time.Second
+	ColdGetConflictMin  = time.Second
+
 	// and a few more hardcoded below
 )
 
@@ -1849,6 +1855,10 @@ func (c *TimeoutConf) Validate() error {
 		return fmt.Errorf("invalid timeout.object_md=%s (expecting 0 (zero) for system default or [%v, %v] range)",
 			c.ObjectMD, LcacheEvictMin, LcacheEvictMax)
 	}
+	if c.ColdGetConflict != 0 && (c.ColdGetConflict.D() < ColdGetConflictMin || c.ColdGetConflict > c.MaxHostBusy) {
+		return fmt.Errorf("invalid timeout.cold_get_conflict=%s (expecting 0 (zero) for system default or [%v, max_host_busy=%v] range)",
+			c.ColdGetConflict, ColdGetConflictMin, c.MaxHostBusy)
+	}
 	return nil
 }
 
