reduce cold-GET conflict timeout; fix jitter (typo)

alex-aizman · alex-aizman · commit aa7c05e8f298 · 2025-05-20T11:49:31.000-04:00
* was 20s default, now about 5s
* separately:
    add `omitempty` tag to `timeout.object_md`

Signed-off-by: Alex Aizman &lt;alex.aizman@gmail.com&gt;
diff --git a/ais/tgtobj.go b/ais/tgtobj.go
@@ -2026,19 +2026,22 @@ 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}
 	// jitter
 	switch goi.ltime & 0x3 {
 	case 0:
 		u.sleep += 3 * time.Millisecond
-	case 0x01:
+	case 0x1:
 		u.sleep += 7 * time.Millisecond
-	case 0x10:
+	case 0x2:
 		u.sleep -= 7 * time.Millisecond
-	case 0x11:
+	case 0x3:
 		u.sleep -= 3 * time.Millisecond
 	}
-	u.timeout = max(c.Timeout.MaxHostBusy.D()-c.Timeout.CplaneOperation.D(), c.Timeout.MaxKeepalive.D())
+	u.timeout = max(retries*u.sleep, c.Timeout.MaxKeepalive.D())
 	return u
 }
 
diff --git a/cmn/config.go b/cmn/config.go
@@ -300,7 +300,7 @@ type (
 		// intra-cluster EC streams; default=EcStreamsDflt; never timeout when negative
 		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"`
+		ObjectMD cos.Duration `json:"object_md,omitempty"`
 	}
 	TimeoutConfToSet struct {
 		CplaneOperation *cos.Duration `json:"cplane_operation,omitempty"`
@@ -310,7 +310,7 @@ type (
 		JoinAtStartup   *cos.Duration `json:"join_startup_time,omitempty"`
 		SendFile        *cos.Duration `json:"send_file_time,omitempty"`
 		EcStreams       *cos.Duration `json:"ec_streams_time,omitempty"`
-		ObjectMD        *cos.Duration `json:"object_md"`
+		ObjectMD        *cos.Duration `json:"object_md,omitempty"`
 	}
 
 	ClientConf struct {
