diff --git a/pkg/meta/redis.go b/pkg/meta/redis.go index 7f2d85122295..197bebe2e9a7 100644 --- 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 index 89688dda9c39..58150664f10c 100644 --- 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 index 069d6f834e08..664f97b8d25a 100644 --- 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 } }