Fix cleanupDelayedSlices to respect time limits as expected (#5463)

Signed-off-by: Changxin Miao <[email protected]>
juicedata · Dec 30, 2024 · 591e095 · 591e095
1 parent 635a37c
commit 591e095
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/pkg/meta/redis.go b/pkg/meta/redis.go
@@ -2914,11 +2914,11 @@ func (r *redisMeta) doCleanupDelayedSlices(edge int64) (int, error) {
 					r.deleteSlice(s.Id, s.Size)
 					count++
 				}
+				if time.Since(start) > 50*time.Minute {
+					return stop
+				}
 			}
 		}
-		if time.Since(start) > 50*time.Minute {
-			return stop
-		}
 		return nil
 	})
 	if err == stop {

diff --git a/pkg/meta/sql.go b/pkg/meta/sql.go
@@ -2863,9 +2863,12 @@ func (m *dbMeta) doCleanupDelayedSlices(edge int64) (int, error) {
 					m.deleteSlice(s.Id, s.Size)
 					count++
 				}
+				if time.Since(start) > 50*time.Minute {
+					return count, nil
+				}
 			}
 		}
-		if len(result) < batch || time.Since(start) > 50*time.Minute {
+		if len(result) < batch {
 			break
 		}
 	}

diff --git a/pkg/meta/tkv.go b/pkg/meta/tkv.go
@@ -2338,9 +2338,12 @@ func (m *kvMeta) doCleanupDelayedSlices(edge int64) (int, error) {
 					m.deleteSlice(s.Id, s.Size)
 					count++
 				}
+				if time.Since(start) > 50*time.Minute {
+					return count, nil
+				}
 			}
 		}
-		if len(keys) < batch || time.Since(start) > 50*time.Minute {
+		if len(keys) < batch {
 			break
 		}
 	}