mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-22 01:31:34 +00:00
* feat(s3api): apply lifecycle TTL at write time The S3 server already has the bucket's lifecycle XML at PUT time (via the cached BucketConfig), so volume-TTL routing is just a per-write decision instead of something that needs a separate filer.conf projection kept in sync via operator commands. - BucketConfig caches the canonical Rules parsed from the lifecycle XML once on load (BucketConfigCache invalidates on Put/Delete Lifecycle, so the rules stay current automatically). - resolveLifecycleTTLForWrite walks the cached rules: longest-prefix match, applies tag and size filters against the request, returns Days * 86400. Versioned buckets, non-Expiration.Days rules, and unevaluable size filters (no Content-Length) yield 0 — the lifecycle worker handles those at scan time. - putToFiler resolves TTL once and passes it through both the AssignVolumeRequest (so chunks land on a TTL volume) and the new entry's Attributes.TtlSec (so the filer's RocksDB compaction also expires the metadata). Lifecycle XML PUT/DELETE now influences write routing immediately — no operator command, no filer.conf bookkeeping. The lifecycle worker remains authoritative for the cases the fast path can't cover (existing objects via bootstrap, versioned buckets, noncurrent retention, abort-MPU, tag/size filters that didn't hold at PUT time). CompleteMultipartUpload and CopyObject still need wiring; left for follow-ups so this PR stays scoped. * perf(s3api): pre-filter and sort lifecycle rules for the per-PUT TTL walk resolveLifecycleTTLForWrite walked every lifecycle rule on every PutObject, including disabled / non-Expiration.Days rules that could never fire on the fast path, and computed "longest prefix wins" via a running max instead of an early exit. Cache a pre-filtered + pre-sorted slice in BucketConfig: - buildTTLFastPathRules drops everything except Status=Enabled + ExpirationDays>0; - sorts by descending prefix length (stable, so equal-length rules keep their XML order). The resolver returns on first prefix+filter match. A bucket whose lifecycle XML has no Expiration.Days rules is now O(1); a typical bucket with one Expiration.Days rule walks one HasPrefix per PUT. The cache is built once per bucket-config load. PutBucketLifecycle / DeleteBucketLifecycle already invalidate the cache, so the fast-path slice stays current automatically. * refactor(s3api): LifecycleTTLResolver object + four review fixes Pulls the per-PUT TTL resolution into a dedicated type so the bucket config holds one object instead of a slice + magic-walk function: - LifecycleTTLResolver wraps the pre-filtered, pre-sorted rules. nil-safe Resolve so the call site doesn't have to special-case buckets with no eligible rules. Four review findings: 1. (high) drop tag-filtered rules from the fast path. Tags are mutable post-PUT via PutObjectTagging but volume TTL is irreversible — an object that matched at write time would still expire after the tag was removed. Worker re-evaluates current tags at scan time. Fast path now keeps only stable predicates: prefix and size. 2. (high) move TTL resolution out of putToFiler. MPU parts, copy-part destinations, and other transient writes called putToFiler with object="" — bucket-wide rules (empty Prefix) matched and bound a TTL clock starting at part-upload time, before CompleteMultipartUpload existed. putToFiler now takes an explicit ttlSec parameter; only the user-visible PutObject paths (PutObjectHandler, postpolicy) feed it from the resolver. MPU and copy-part pass 0. 3. (medium) AWS overlapping-rule precedence is "shorter expiration wins", not "longest prefix wins". Sort by ExpirationDays ascending so the first prefix match is also the shortest applicable rule. 4. (medium) overflow no longer caps at math.MaxInt32 seconds (~68y). A longer policy would have expired early. Return 0 instead so the worker enforces the actual policy on its own schedule. Versioning gate moves into the resolver constructor — versioned buckets get a nil resolver. The five putToFiler callers all updated: PutObjectHandler + postpolicy resolve via lifecycleTTLForObjectWrite, suspended/versioned wrappers pass 0 by construction, MPU part and copy-part SSE pass 0 with a one-line comment about why. * refactor(s3api): drop unused BucketConfig.LifecycleRules field The full canonical rule set was set on every bucket-config load but never read — resolveLifecycleTTLForWrite worked off the resolver's filtered slice, and the lifecycle worker reads bucket entries straight off the meta-log instead of this cache. Remove the field and its s3lifecycle import. * perf(s3api): pre-compute LifecycleTTLResolver hot-path fields Resolve was doing per-call work that's actually constant per bucket- config load: int64 multiplication, max-int32 overflow check, field indirections through *s3lifecycle.Rule. Move it to the constructor and pack the rule into a compact ttlRule (prefix + ttlSec int32 + sizeGT/sizeLT) so the inner loop is HasPrefix → optional size check → return. Drop overflowing rules at construction rather than handling per- resolve: capping would expire long policies early, and returning 0 in the inner loop would prevent any shorter overlapping rule from firing. Drop-at-construction composes correctly with the ascending sort. Benchmarks (Apple M4): NilReceiver 0.99 ns/op 0 B/op OneRuleMatching 2.75 ns/op 0 B/op FiveRulesNoMatch 13.5 ns/op 0 B/op * fix(s3api): refresh LifecycleTTL resolver on bucket-config update storeBucketLifecycleConfiguration writes to Entry.Extended via updateBucketConfig, which clones the cached BucketConfig and calls the user fn, then caches the result. The clone inherits the prior LifecycleTTL pointer and nothing rebuilt it from the new XML, so add/replace/delete of a lifecycle policy left the wrong resolver in cache until eviction. Same gap on the meta-log side: peer-driven updates flowed through updateBucketConfigCacheFromEntry without re-deriving the resolver. Centralize the Entry -> derived-field mapping in one helper that resets every Extended-backed field then repopulates from the entry, and call it from getBucketConfig (initial load), updateBucketConfig (after updateEntry succeeds, before caching), and updateBucketConfigCacheFromEntry (meta-log path). Reset is the load-bearing part: deleting the lifecycle XML must yield a nil resolver, since stamping a stale TTL onto subsequent writes is irreversible. * fix(s3api): PostPolicy passes object size, not multipart wire size lifecycleTTLForObjectWrite was reading r.ContentLength, which on the PostPolicy path is the multipart envelope (form fields + boundaries), not the uploaded object body. A size-filtered rule would evaluate against that inflated total and stamp (or skip) a TTL the policy didn't intend. Take the object size as an explicit parameter. PutObject still passes r.ContentLength (correct there); PostPolicy passes the fileSize already extracted from the form part. Negative size means unknown and continues to skip any size-filtered rule. * fix(s3api): treat Object Lock as versioned for lifecycle TTL fast path Object Lock requires versioning at the API level, but it can be enabled at create time without S3 ever writing the explicit Versioning header. The lifecycle resolver construction site only checked Versioning, so an Object-Lock bucket with no Versioning byte would still get a fast-path resolver and stamp volume TTL onto writes — destroying noncurrent versions when the volume expires. Mirror the OR already used in BucketIsVersioned: ObjectLockConfig non-nil counts as versioned for resolver construction. Existing explicit-Versioning paths are unchanged.
153 lines
5.4 KiB
Go
153 lines
5.4 KiB
Go
package s3api
|
|
|
|
import (
|
|
"math"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3lifecycle"
|
|
)
|
|
|
|
// secondsPerDay is the conversion factor between Lifecycle Expiration.Days
|
|
// (a calendar-day count) and the volume server's TTL field (seconds since
|
|
// creation). This intentionally does NOT use AWS's "next 00:00 UTC" rounding;
|
|
// that's an expiration-firing nuance the lifecycle worker enforces, not
|
|
// something the per-write fast path can model without reading the clock at
|
|
// each write.
|
|
const secondsPerDay = int64(86400)
|
|
|
|
// LifecycleTTLResolver answers "what volume TTL should this write get?" for
|
|
// the PutObject path. Constructed once per bucket-config load with a
|
|
// pre-filtered, pre-sorted slice of compact rules so per-write cost is one
|
|
// HasPrefix per rule walked, exiting on first match.
|
|
//
|
|
// Stable predicates only: prefix and size. Tag-filtered rules are NOT in
|
|
// the fast path because tags can be replaced post-PUT via PutObjectTagging
|
|
// while volume TTL is irreversible — an object that matched at write time
|
|
// would still expire after the tag was removed. The lifecycle worker
|
|
// re-evaluates current tags at scan time.
|
|
//
|
|
// nil receiver means "no TTL applies" (no eligible rules, bucket
|
|
// versioned, or every rule overflows int32 seconds); callers can use a
|
|
// nil resolver freely.
|
|
type LifecycleTTLResolver struct {
|
|
rules []ttlRule
|
|
}
|
|
|
|
// ttlRule is the compact, hot-path projection of an Expiration.Days rule:
|
|
// just the four fields Resolve reads, with ExpirationDays already converted
|
|
// to int32 seconds so the inner loop has no arithmetic and no overflow
|
|
// branch.
|
|
type ttlRule struct {
|
|
prefix string
|
|
ttlSec int32
|
|
sizeGT int64
|
|
sizeLT int64
|
|
}
|
|
|
|
// NewLifecycleTTLResolver pre-filters and pre-sorts rules. Returns nil
|
|
// when nothing on the fast path can apply — callers don't need to special-
|
|
// case the empty-bucket / versioned-bucket / tag-only-rules cases.
|
|
//
|
|
// Sort is ascending by ttlSec so first prefix match is also the shortest
|
|
// matching expiration — AWS's overlapping-rule precedence (see
|
|
// https://docs.aws.amazon.com/AmazonS3/latest/userguide/lifecycle-conflicts.html).
|
|
// Stable so equal-Days rules keep their XML order.
|
|
//
|
|
// Rules that overflow int32 seconds (~68 years) are dropped at construction
|
|
// rather than handled per-resolve: capping would expire long policies
|
|
// early, and returning 0 from Resolve in the inner loop would prevent any
|
|
// shorter overlapping rule from being considered. Drop-at-construction
|
|
// composes correctly with the ascending sort.
|
|
func NewLifecycleTTLResolver(rules []*s3lifecycle.Rule, versioned bool) *LifecycleTTLResolver {
|
|
if versioned || len(rules) == 0 {
|
|
// Versioned buckets: TTL volumes expire as a unit, which would
|
|
// destroy noncurrent versions. Worker drives expiration there.
|
|
return nil
|
|
}
|
|
out := make([]ttlRule, 0, len(rules))
|
|
for _, r := range rules {
|
|
if r == nil || r.Status != s3lifecycle.StatusEnabled {
|
|
continue
|
|
}
|
|
if r.ExpirationDays <= 0 {
|
|
continue // NoncurrentVersionExpiration / AbortMPU / etc.
|
|
}
|
|
if len(r.FilterTags) > 0 {
|
|
// Tag-mutable; defer to the worker so a tag flip can't leave
|
|
// us with a volume-TTL stamp the policy no longer dictates.
|
|
continue
|
|
}
|
|
secs := int64(r.ExpirationDays) * secondsPerDay
|
|
if secs > math.MaxInt32 {
|
|
// Volume TTL is int32 seconds. A rule that doesn't fit
|
|
// can't be represented without expiring early; the
|
|
// lifecycle worker enforces it on its own schedule.
|
|
continue
|
|
}
|
|
out = append(out, ttlRule{
|
|
prefix: r.Prefix,
|
|
ttlSec: int32(secs),
|
|
sizeGT: r.FilterSizeGreaterThan,
|
|
sizeLT: r.FilterSizeLessThan,
|
|
})
|
|
}
|
|
if len(out) == 0 {
|
|
return nil
|
|
}
|
|
sort.SliceStable(out, func(i, j int) bool {
|
|
return out[i].ttlSec < out[j].ttlSec
|
|
})
|
|
return &LifecycleTTLResolver{rules: out}
|
|
}
|
|
|
|
// Resolve returns the volume TTL (in seconds) for a write of the given
|
|
// object key and size, or 0 when no fast-path rule applies.
|
|
//
|
|
// The receiver may be nil — that's the common "no rules" case and it
|
|
// returns 0 without allocating.
|
|
func (r *LifecycleTTLResolver) Resolve(objectKey string, size int64) int32 {
|
|
if r == nil {
|
|
return 0
|
|
}
|
|
for i := range r.rules {
|
|
rule := &r.rules[i]
|
|
if !strings.HasPrefix(objectKey, rule.prefix) {
|
|
continue
|
|
}
|
|
// Size filter: unevaluable when Content-Length is unknown
|
|
// (size<0) and the rule has any size predicate; otherwise
|
|
// either bound short-circuits.
|
|
if rule.sizeGT > 0 || rule.sizeLT > 0 {
|
|
if size < 0 {
|
|
continue
|
|
}
|
|
if rule.sizeGT > 0 && size <= rule.sizeGT {
|
|
continue
|
|
}
|
|
if rule.sizeLT > 0 && size >= rule.sizeLT {
|
|
continue
|
|
}
|
|
}
|
|
return rule.ttlSec
|
|
}
|
|
return 0
|
|
}
|
|
|
|
// lifecycleTTLForObjectWrite is the PutObject call-site wrapper. Returns 0
|
|
// for any caller (MPU part, copy-part) that shouldn't bind a TTL clock —
|
|
// see putToFiler's signature comment for which paths pass 0 directly.
|
|
//
|
|
// Callers MUST pass the actual object size, not r.ContentLength when those
|
|
// differ. r.ContentLength is the wire size: for a multipart PostPolicy
|
|
// upload it includes form fields and boundaries, so a size-filtered rule
|
|
// would mis-evaluate against the form total instead of the file body.
|
|
// objectSize<0 is "unknown" — the resolver skips any size-filtered rule.
|
|
func (s3a *S3ApiServer) lifecycleTTLForObjectWrite(bucket, objectKey string, objectSize int64) int32 {
|
|
cfg, _ := s3a.getBucketConfig(bucket)
|
|
if cfg == nil || cfg.LifecycleTTL == nil {
|
|
return 0
|
|
}
|
|
return cfg.LifecycleTTL.Resolve(objectKey, objectSize)
|
|
}
|