mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-16 08:45:22 +01:00
* s3 lifecycle: walk checkpoints take each entry's resume position Versions of one object share a Path, so a checkpoint set from Path after the first version made a resume skip the rest. The ListFunc now gives each entry the start value that continues after it, and leaves it empty on all but an object's last version. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: resume a bucket listing where the walk stopped The filer listing skipped entries with key <= start, but its order is not key order: each directory emits its .versions groups before its files, and a directory's children come before a sibling like dir.txt. Positions are now one (pass, name) frame per directory level, so a resume seeds each listing and skips exactly what was finished. A version group is one unit, and a skipped group still keeps its bare null version out of the second pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: content hash of a walk view Hashes every non-disabled action of a view and the versioning of their buckets, so a saved walk position can be tied to the walk it came from: another rule set, another walk mode, or a bucket that turned versioned gives another hash. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: persist daily walk progress and resume it A walk that failed or was cut short started over on the next pass, listing again every bucket it had already finished. WalkBuckets now keeps the finished buckets and each unfinished bucket's position in a checkpoint file next to the shard cursors, one per shard set, and the next walk of the same view and shards resumes from it. The record is saved every 30s and when the walk stops, and cleared when a walk completes, so the next walk is full again and sees keys added behind the position; a clear that fails fails the walk rather than leave a record that would skip buckets. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: a stuck resumed walk starts over A bucket that fails at the same place on every pass kept the walk from completing, so the buckets it had finished were never walked again and their due objects waited forever. A resumed walk that fails again without finishing anything clears its checkpoint, and the next walk is full. A canceled walk keeps it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: do not resume a walk checkpoint left for a week A checkpoint is cleared only by a later walk of the same shard set, so a set that stopped walking, such as a one-off per-shard walk, left its record behind, and a walk of that set much later would skip buckets finished long before. Records now carry their save time and are not resumed after seven days; a walk that keeps retrying saves on every attempt and stays fresh. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: a failed walk without progress leaves its checkpoint alone A pass canceled while it read the checkpoint failed the read, then saved its own empty progress over the record it never loaded, so the next pass started every bucket again. A failed walk that finished nothing has nothing new to record and no longer writes; the stuck resume reset still clears. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: space out walk checkpoint saves after a failed one The save time advanced only on success, so once the filer refused a periodic save every following entry tried again and logged another warning. The interval now counts from the last attempt. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: a walk checkpoint save that errors may still be on disk A save whose reply was lost left onDisk false, so a walk that then completed skipped the clear and the next walk resumed from the stale record instead of walking everything. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: keep a stalled walk checkpoint for a day A resumed walk that failed again without progress dropped its record right away, so an outage spanning two attempts restarted the whole walk. Treat the walk as stuck only once its record has not advanced for a day. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: a resumed walk counts its earlier buckets as walked Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: replay a resumed recovery walk from the walk that began it A recovery or cold-start pass rewinds replay to runNow - maxTTL. When the walk resumed a checkpoint, its finished buckets were listed in an earlier attempt, so an object there that was not yet due then and whose write is now older than maxTTL was neither expired by the walk nor replayed. The checkpoint now keeps the start of the walk that began it, WalkBuckets returns that time (its own start for a fresh walk), and runShard floors the recovery rewind and the cold-start replay at it. A record without a start is not resumed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: a cold start that resumed a walk replays on the next pass The pass's shared subscription starts at runNow - maxTTL for a shard without a cursor, before its walk reports an earlier start, so flooring the cold-start drain at the walk start could not deliver the older events. Such a shard now saves its cursor at the walk start minus maxTTL and returns, like the recovery branch, and the next pass replays the window from that cursor. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: test that a cursor below the floor opens the next subscription Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3 lifecycle: test the cold-start replay across two Run passes A cold start whose walk resumed an earlier attempt sees an older event only on the next pass. The test runs Run twice against a filer that serves events past the requested floor, with a later in-window event that would otherwise move the cursor past the older one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
233 lines
7.0 KiB
Go
233 lines
7.0 KiB
Go
package dailyrun
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"sort"
|
|
"sync"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3lifecycle"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3lifecycle/engine"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// Issue #11791: a pass used to invoke the walker once per shard, so the
|
|
// whole bucket tree was listed ShardCount times. The walker now gets
|
|
// the full shard set in at most two calls per pass — one for the
|
|
// recovery group, one for the steady group.
|
|
func TestRun_SharesBucketWalkAcrossShards(t *testing.T) {
|
|
e := engine.New()
|
|
e.Compile([]engine.CompileInput{
|
|
{Bucket: "b1", Rules: []*s3lifecycle.Rule{
|
|
{ID: "r", Status: s3lifecycle.StatusEnabled,
|
|
ExpirationDate: time.Now().Add(24 * time.Hour)},
|
|
}},
|
|
}, engine.CompileOptions{})
|
|
|
|
shards := make([]int, 0, s3lifecycle.ShardCount)
|
|
for i := 0; i < s3lifecycle.ShardCount; i++ {
|
|
shards = append(shards, i)
|
|
}
|
|
|
|
var mu sync.Mutex
|
|
var calls [][]int
|
|
p := newMemPersister()
|
|
cfg := Config{
|
|
Shards: shards,
|
|
BucketsPath: "/buckets",
|
|
Engine: e,
|
|
FilerClient: stubFilerClient{},
|
|
Client: stubLifecycleClient{},
|
|
Persister: p,
|
|
Lister: stubSiblingLister{},
|
|
Walker: func(_ context.Context, _ *engine.Snapshot, shards []int) (time.Time, error) {
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
calls = append(calls, append([]int{}, shards...))
|
|
return time.Time{}, nil
|
|
},
|
|
}
|
|
runNow := time.Unix(1_700_000_000, 0).UTC()
|
|
cfg.Now = func() time.Time { return runNow }
|
|
require.NoError(t, Run(context.Background(), cfg))
|
|
|
|
require.LessOrEqual(t, len(calls), 2, "a pass must not list the bucket once per shard")
|
|
covered := map[int]bool{}
|
|
for _, c := range calls {
|
|
for _, sh := range c {
|
|
covered[sh] = true
|
|
}
|
|
}
|
|
for _, sh := range shards {
|
|
assert.True(t, covered[sh], "shard %d missed the shared walk", sh)
|
|
c, found, err := p.Load(context.Background(), sh)
|
|
require.NoError(t, err)
|
|
require.True(t, found)
|
|
assert.Equal(t, runNow.UnixNano(), c.LastWalkedNs,
|
|
"shard %d must credit the shared walk to its own cursor", sh)
|
|
}
|
|
}
|
|
|
|
// A recovery group and a steady group in the same pass share one walk
|
|
// each: two walker calls total, each covering its own shard set and
|
|
// its own view.
|
|
func TestRun_RecoveryAndSteadyGroupsWalkSeparately(t *testing.T) {
|
|
e := engine.New()
|
|
e.Compile([]engine.CompileInput{
|
|
{Bucket: "b1", Rules: []*s3lifecycle.Rule{
|
|
{ID: "r", Status: s3lifecycle.StatusEnabled,
|
|
ExpirationDays: 30,
|
|
ExpirationDate: time.Now().Add(24 * time.Hour)},
|
|
}},
|
|
}, engine.CompileOptions{})
|
|
snap := e.Snapshot()
|
|
for _, a := range snap.AllActions() {
|
|
snap.MarkActive(a.Key)
|
|
}
|
|
|
|
p := newMemPersister()
|
|
var stale [32]byte
|
|
for i := range stale {
|
|
stale[i] = 0xAA
|
|
}
|
|
// Shard 0's stale rule hash sends it through the recovery walk.
|
|
// Shards 1 and 2 have matching hashes and a zero walk anchor, so
|
|
// the steady-state branch takes them.
|
|
require.NoError(t, p.Save(context.Background(), 0, Cursor{TsNs: 42, RuleSetHash: stale}))
|
|
matching := Cursor{
|
|
TsNs: 1234,
|
|
RuleSetHash: engine.ReplayContentHash(snap),
|
|
PromotedHash: engine.PromotedHash(snap, engine.MaxEffectiveTTL(snap)),
|
|
}
|
|
for _, sh := range []int{1, 2} {
|
|
require.NoError(t, p.Save(context.Background(), sh, matching))
|
|
}
|
|
|
|
var mu sync.Mutex
|
|
var calls [][]int
|
|
var actions []int
|
|
cfg := Config{
|
|
Shards: []int{0, 1, 2},
|
|
BucketsPath: "/buckets",
|
|
Engine: e,
|
|
FilerClient: &idleSubscribeClient{},
|
|
Client: stubLifecycleClient{},
|
|
Persister: p,
|
|
Lister: stubSiblingLister{},
|
|
Walker: func(_ context.Context, view *engine.Snapshot, shards []int) (time.Time, error) {
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
calls = append(calls, append([]int{}, shards...))
|
|
actions = append(actions, len(view.AllActions()))
|
|
return time.Time{}, nil
|
|
},
|
|
}
|
|
require.NoError(t, Run(context.Background(), cfg))
|
|
|
|
require.Len(t, calls, 2, "one shared walk per group: recovery + steady")
|
|
for i, c := range calls {
|
|
sort.Ints(c)
|
|
switch {
|
|
case len(c) == 1 && c[0] == 0:
|
|
assert.Equal(t, 2, actions[i], "recovery view carries every non-disabled action")
|
|
case len(c) == 2 && c[0] == 1 && c[1] == 2:
|
|
assert.Equal(t, 1, actions[i], "walk view carries only the walker-bound action")
|
|
default:
|
|
t.Fatalf("unexpected walk group %v", c)
|
|
}
|
|
}
|
|
}
|
|
|
|
// A shared walk error must surface on every shard it covered, not just
|
|
// the one that happened to run the listing.
|
|
func TestRun_SharedWalkErrorFailsCoveredShards(t *testing.T) {
|
|
e := engine.New()
|
|
e.Compile([]engine.CompileInput{
|
|
{Bucket: "b1", Rules: []*s3lifecycle.Rule{
|
|
{ID: "r", Status: s3lifecycle.StatusEnabled,
|
|
ExpirationDate: time.Now().Add(24 * time.Hour)},
|
|
}},
|
|
}, engine.CompileOptions{})
|
|
|
|
cfg := Config{
|
|
Shards: []int{0, 1},
|
|
BucketsPath: "/buckets",
|
|
Engine: e,
|
|
FilerClient: stubFilerClient{},
|
|
Client: stubLifecycleClient{},
|
|
Persister: newMemPersister(),
|
|
Lister: stubSiblingLister{},
|
|
Walker: func(_ context.Context, _ *engine.Snapshot, _ []int) (time.Time, error) {
|
|
return time.Time{}, errors.New("walk boom")
|
|
},
|
|
}
|
|
err := Run(context.Background(), cfg)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "walk boom")
|
|
}
|
|
|
|
// countingPersister fails Load after the first failAfter calls: call 1
|
|
// feeds planWalks, the failing call 2 is runShard's authoritative read.
|
|
type countingPersister struct {
|
|
inner CursorPersister
|
|
calls atomic.Int32
|
|
failAfter int32
|
|
}
|
|
|
|
func (p *countingPersister) Load(ctx context.Context, shardID int) (Cursor, bool, error) {
|
|
if p.calls.Add(1) > p.failAfter {
|
|
return Cursor{}, false, errors.New("transient load failure")
|
|
}
|
|
return p.inner.Load(ctx, shardID)
|
|
}
|
|
|
|
func (p *countingPersister) Save(ctx context.Context, shardID int, c Cursor) error {
|
|
return p.inner.Save(ctx, shardID, c)
|
|
}
|
|
|
|
// A shard whose second cursor load fails exits runShard without
|
|
// awaiting the planned walk it was grouped into. The walk goroutine is
|
|
// already running — Run must still join it, or the handler tears down
|
|
// the filer connection while the walk is mid-listing.
|
|
func TestRun_JoinsPlannedWalkWhenShardExitsEarly(t *testing.T) {
|
|
e := engine.New()
|
|
e.Compile([]engine.CompileInput{
|
|
{Bucket: "b1", Rules: []*s3lifecycle.Rule{
|
|
{ID: "r", Status: s3lifecycle.StatusEnabled,
|
|
ExpirationDate: time.Now().Add(24 * time.Hour)},
|
|
}},
|
|
}, engine.CompileOptions{})
|
|
|
|
walkStarted := make(chan struct{})
|
|
walkRelease := make(chan struct{})
|
|
cfg := Config{
|
|
Shards: []int{0},
|
|
BucketsPath: "/buckets",
|
|
Engine: e,
|
|
FilerClient: stubFilerClient{},
|
|
Client: stubLifecycleClient{},
|
|
Persister: &countingPersister{inner: newMemPersister(), failAfter: 1},
|
|
Lister: stubSiblingLister{},
|
|
Walker: func(context.Context, *engine.Snapshot, []int) (time.Time, error) {
|
|
close(walkStarted)
|
|
<-walkRelease
|
|
return time.Time{}, nil
|
|
},
|
|
}
|
|
runDone := make(chan error, 1)
|
|
go func() { runDone <- Run(context.Background(), cfg) }()
|
|
|
|
<-walkStarted
|
|
select {
|
|
case <-runDone:
|
|
t.Fatal("Run returned while the planned walk was still running")
|
|
case <-time.After(200 * time.Millisecond):
|
|
}
|
|
close(walkRelease)
|
|
require.Error(t, <-runDone)
|
|
}
|