mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-20 13:30:46 +02:00
* feat(s3/lifecycle/router): emit ABORT_MPU events for .uploads/<id> init dirs Detect a meta-log event at exactly .uploads/<upload_id> (a directory) and build the ObjectInfo from its destination key (entry.Extended[key]) so a rule with Filter.Prefix=foo/ matches an MPU uploading to foo/bar. Sub-events under .uploads/<id>/<part> ride a different mtime and would over-fire the ABORT_MPU schedule, so they're rejected explicitly. m.ObjectKey stays as ev.Key (.uploads/<upload_id>) — the dispatcher needs the upload directory path, not the destination key, to actually remove the in-flight upload. * feat(s3api): wire LifecycleDelete ABORT_MPU to remove the upload dir Replaces the retryLater stub. Validates the .uploads/<upload_id> shape of req.ObjectPath (so a malformed event can't escalate to a wider rm), then deletes the upload directory under <bucket>/.uploads/<id>. Maps NotFound to NOOP_RESOLVED, transport errors to RETRY_LATER, success to DONE. * refactor(s3api): drop redundant exists check before lifecycle ABORT_MPU rm s3a.rm already does a NotFound-returning lookup, so the pre-check just adds a round-trip. Map filer_pb.ErrNotFound to NOOP_RESOLVED on rm, keep transport errors as RETRY_LATER. * refactor(s3/lifecycle/router): use s3_constants for MPU paths + Extended key Drop the hardcoded ".uploads/" and "key" string literals; the symbols already exist as s3_constants.MultipartUploadsFolder and ExtMultipartObjectKey, and the server side reaches them through the same constants. Keeping the test helpers tied to those names also makes the negative-result tests meaningful — they'd otherwise still pass if the lookup constant drifted. * fix(s3api): close lifecycle ABORT_MPU traversal + NOT_FOUND gaps Two issues with the recent ABORT_MPU plumbing: - "." and ".." passed the no-slash check but resolve to the bucket root via util.JoinPath, so .uploads/.. could rm the wrong directory. - filer.DeleteEntry suppresses ErrNotFound and returns success, so the rm path can't distinguish missing from deleted; the previous version reported DONE for an already-aborted upload instead of NOOP_RESOLVED. Reject the two reserved names explicitly and restore the existence pre-check so the outcome map stays correct. Add a table-test covering the rejected paths. * fix(s3/lifecycle/bootstrap): walk MPU init dirs by destination key A real MPU init record is a directory under .uploads/<id> created by mkdir; the bootstrap walker was skipping every directory entry, so an MPU that existed before the meta-log subscription was never aborted. Even with the skip relaxed, MatchPath used the .uploads/<id> path, so a rule with Filter.Prefix=logs/ would never fire on an MPU uploading to logs/foo.txt. Add Entry.DestKey, let IsMPUInit directories through, and use DestKey for both MatchPath and ObjectInfo.Key. A bare init directory with no DestKey means metadata hasn't landed yet — skip rather than guess. * fix(s3/lifecycle): gate (kind, info) shape so MPU init only fires ABORT_MPU An MPU init record carries IsMPUInit=true and IsLatest=false. Without gating, the router and bootstrap walker matched it against every active ActionKey for the bucket, so NONCURRENT_DAYS / NEWER_NONCURRENT fired (IsLatest=false reads as a noncurrent version). The dispatcher would then BLOCK on empty version_id and freeze the cursor. Add a shape gate at both call sites: - IsMPUInit + non-ABORT_MPU kind → continue - regular object + ABORT_MPU kind → continue Plus a defense-in-depth check at the top of EvaluateAction so future callers can't reintroduce the bug. Tests cover all three layers. * test(s3/lifecycle): tighten dual-action coverage at the call sites - Walk multi-action: replace the kinds-as-set check with an exact-shape DeepEqual on (path, kind) tuples. The set check would have missed an MPU init wrongly firing NONCURRENT_DAYS — exactly the regression the (kind, info) gate fixes. - Router: add a converse case for the dual ExpirationDays + AbortIncompleteMultipartUpload rule. A regular current-version object must fire only EXPIRATION_DAYS; without the gate the dispatcher would also receive ABORT_MPU and rm the object via the MPU code path.
183 lines
5.9 KiB
Go
183 lines
5.9 KiB
Go
// Package bootstrap is the bucket-level lifecycle walker. The walker
|
|
// iterates every entry under a bucket, evaluates every active ActionKey
|
|
// against it, and dispatches inline-delete RPCs for currently-due actions;
|
|
// not-yet-due entries are left for the meta-log reader to pick up later.
|
|
//
|
|
// Callback-driven so the listing source and the LifecycleDelete dispatcher
|
|
// can be supplied separately (real client or test fake).
|
|
package bootstrap
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3lifecycle"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3lifecycle/engine"
|
|
)
|
|
|
|
// Entry is the routing-relevant slice of a filer entry. SuccessorModTime
|
|
// and NoncurrentIndex are populated only on versioned-bucket walks; the
|
|
// retention path bails out conservatively when they're zero / nil.
|
|
//
|
|
// MPU init directories at .uploads/<id> populate DestKey with the
|
|
// destination object key (from entry.Extended[ExtMultipartObjectKey]) so
|
|
// rule-prefix matching works on the user's intended path while Path
|
|
// stays as the upload directory the dispatcher must rm.
|
|
type Entry struct {
|
|
Path string
|
|
DestKey string
|
|
ModTime time.Time
|
|
Size int64
|
|
IsDirectory bool
|
|
IsLatest bool
|
|
IsDeleteMarker bool
|
|
IsMPUInit bool
|
|
NumVersions int
|
|
Tags map[string]string
|
|
|
|
SuccessorModTime time.Time
|
|
NoncurrentIndex *int
|
|
}
|
|
|
|
// ListFunc must skip entries with Path <= start so kill-resume picks up
|
|
// where the previous run stopped.
|
|
type ListFunc func(ctx context.Context, bucket, start string, cb func(*Entry) error) error
|
|
|
|
// Dispatcher executes one (action, entry) verdict. An error halts the walk;
|
|
// the caller decides whether to retry from the recorded last_scanned_path.
|
|
type Dispatcher interface {
|
|
Delete(ctx context.Context, action *engine.CompiledAction, entry *Entry) error
|
|
}
|
|
|
|
// Checkpoint is the resume state. Caller persists it under
|
|
// /etc/s3/lifecycle/<bucket>/_bootstrap.
|
|
type Checkpoint struct {
|
|
LastScannedPath string
|
|
Completed bool
|
|
}
|
|
|
|
type WalkOptions struct {
|
|
Resume string
|
|
Now time.Time
|
|
}
|
|
|
|
// Walk iterates entries via list, evaluates each active ActionKey via
|
|
// MatchPath + EvaluateAction, and calls Dispatcher.Delete for currently-due
|
|
// actions. SCAN_AT_DATE actions are skipped (their bootstrap is scheduled
|
|
// separately).
|
|
func Walk(ctx context.Context, snap *engine.Snapshot, bucket string, list ListFunc, dispatch Dispatcher, opts WalkOptions) (Checkpoint, error) {
|
|
now := opts.Now
|
|
if now.IsZero() {
|
|
now = time.Now().UTC()
|
|
}
|
|
cp := Checkpoint{LastScannedPath: opts.Resume}
|
|
|
|
// Reuse one ObjectInfo across the walk; EvaluateAction reads it
|
|
// synchronously without retaining.
|
|
var info s3lifecycle.ObjectInfo
|
|
|
|
err := list(ctx, bucket, opts.Resume, func(entry *Entry) error {
|
|
if entry == nil || entry.Path == "" {
|
|
return nil
|
|
}
|
|
// MPU init directories at .uploads/<id> are the one directory
|
|
// shape lifecycle cares about; everything else stays out.
|
|
if entry.IsDirectory && !entry.IsMPUInit {
|
|
cp.LastScannedPath = entry.Path
|
|
return nil
|
|
}
|
|
if err := walkEntry(ctx, snap, bucket, entry, dispatch, now, &info); err != nil {
|
|
return err
|
|
}
|
|
cp.LastScannedPath = entry.Path
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return cp, err
|
|
}
|
|
cp.Completed = true
|
|
return cp, nil
|
|
}
|
|
|
|
func walkEntry(ctx context.Context, snap *engine.Snapshot, bucket string, entry *Entry, dispatch Dispatcher, now time.Time, info *s3lifecycle.ObjectInfo) error {
|
|
// MPU init: rule-prefix matching uses the destination key, not the
|
|
// .uploads/<id> directory path. A bare directory with no DestKey is
|
|
// either a stray dir or an init mid-write before metadata landed —
|
|
// skip rather than guess.
|
|
matchKey := entry.Path
|
|
if entry.IsMPUInit {
|
|
if entry.DestKey == "" {
|
|
return nil
|
|
}
|
|
matchKey = entry.DestKey
|
|
}
|
|
keys := snap.MatchPath(bucket, matchKey, nil)
|
|
if len(keys) == 0 {
|
|
return nil
|
|
}
|
|
*info = s3lifecycle.ObjectInfo{
|
|
Key: matchKey,
|
|
ModTime: entry.ModTime,
|
|
Size: entry.Size,
|
|
IsLatest: entry.IsLatest,
|
|
IsDeleteMarker: entry.IsDeleteMarker,
|
|
IsMPUInit: entry.IsMPUInit,
|
|
NumVersions: entry.NumVersions,
|
|
SuccessorModTime: entry.SuccessorModTime,
|
|
NoncurrentIndex: entry.NoncurrentIndex,
|
|
Tags: entry.Tags,
|
|
}
|
|
for _, key := range keys {
|
|
action := snap.Action(key)
|
|
if action == nil {
|
|
continue
|
|
}
|
|
// SCAN_AT_DATE runs its own date-triggered bootstrap. DISABLED can
|
|
// be flipped at runtime independent of XML Status, so skip it even
|
|
// though EvaluateAction would also reject.
|
|
if action.Mode == engine.ModeScanAtDate || action.Mode == engine.ModeDisabled {
|
|
continue
|
|
}
|
|
// (kind, info) shape gate: ABORT_MPU only on MPU init records,
|
|
// every other kind only on regular objects/versions. Mismatched
|
|
// pairs would either dispatch a noncurrent action with empty
|
|
// version_id (server BLOCKs, cursor freezes) or dispatch
|
|
// ABORT_MPU against a regular object path.
|
|
if entry.IsMPUInit && key.ActionKind != s3lifecycle.ActionKindAbortMPU {
|
|
continue
|
|
}
|
|
if !entry.IsMPUInit && key.ActionKind == s3lifecycle.ActionKindAbortMPU {
|
|
continue
|
|
}
|
|
res := s3lifecycle.EvaluateAction(action.Rule, key.ActionKind, info, now)
|
|
if res.Action == s3lifecycle.ActionNone {
|
|
continue
|
|
}
|
|
if err := dispatch.Delete(ctx, action, entry); err != nil {
|
|
glog.Warningf("lifecycle bootstrap: dispatch %s/%s kind=%s: %v",
|
|
bucket, entry.Path, key.ActionKind, err)
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// EntryCallback wraps an in-memory slice as a ListFunc; useful for tests.
|
|
func EntryCallback(entries []*Entry) ListFunc {
|
|
return func(ctx context.Context, bucket, start string, cb func(*Entry) error) error {
|
|
for _, e := range entries {
|
|
if start != "" && e.Path <= start {
|
|
continue
|
|
}
|
|
if err := cb(e); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func HasPrefix(path, prefix string) bool { return strings.HasPrefix(path, prefix) }
|