Files
seaweedfs/weed/s3api/s3api_versioning_reconciler.go
T
Chris Lu f5a4bfb514 fix(s3/versioning): repair dangling latest-version pointer after partial delete (#9460)
* fix(s3/versioning): repair dangling latest-version pointer after partial delete

deleteSpecificObjectVersion did two non-atomic filer ops: rm the version
blob, then update the .versions/ pointer. Step 2 failures were silently
logged and the client got 204 OK, so any transient blip (filer timeout,
process restart between RPCs, lock contention) left the .versions/
directory naming a missing file. Subsequent GETs paid the 10-retry
self-heal cost and returned NoSuchKey — surfacing as "Storage not found"
to Veeam, which is what triggered this investigation.

Three changes:

1. Pre-roll the pointer for the singleton / multi-version-deleting-latest
   cases. The pointer is repointed (multi) or cleared (singleton) before
   the blob rm. A failure between leaves a recoverable orphan blob —
   pointer is consistent, GETs succeed or correctly miss without
   entering the stale-pointer self-heal path.

2. Wrap the load-bearing filer ops in updateLatestVersionAfterDeletion
   with bounded retries (~6.3s worst case). When retries are exhausted
   the function now returns a non-nil error instead of swallowing it.
   The caller logs at Error level and queues the path for the
   reconciler.

3. Background reconciler drains stranded .versions/ pointer-to-missing
   states off the hot path. Bounded in-memory queue with capped retries;
   read-path heal remains as a last-resort safety net.

* fix(s3/versioning): address review on #9460

Four fixes addressing review on PR #9460. All four are correctness;
no behavioural change for the happy path.

1. repointLatestBeforeDeletion: discriminate NotFound from transient
   errors when re-fetching the .versions/ entry. Previously any error
   returned rolled=true,nil — a transient filer hiccup at that point
   would cause the caller to skip the post-delete reconciliation AND
   proceed with the blob rm, producing exactly the dangling pointer
   state the PR aims to prevent. NotFound stays "vacuously consistent"
   (directory already gone); other errors surface so the caller aborts
   before removing the blob.

2. Move the singleton .versions/ teardown out of
   repointLatestBeforeDeletion (where it ran BEFORE the blob rm and
   always failed with "non-empty folder") into deleteSpecificObjectVersion
   AFTER the blob rm. Adds a wasSingleton return value so the caller
   knows when to run the teardown. Without this, every singleton-version
   delete in a versioned bucket leaked an empty .versions/ directory.

3. Wrap the list, getEntry, and mkFile calls inside
   repointLatestBeforeDeletion with retryFilerOp so the pre-roll has
   the same transient-failure resilience as the post-roll path. Without
   retries, a single transient blip causes the caller to fall back to
   the legacy non-atomic flow even when the filer recovers immediately.

4. healVersionsPointer in the reconciler: same NotFound-vs-transient
   discrimination on both the .versions/ getEntry and the latest-file
   presence probe. Previously a transient filer error would silently
   evict the candidate from the queue as "healed", leaving the real
   stranded state until a client read happened to surface it.

Also fixes the gemini-flagged consistency nit: the queued-for-reconciler
error log now uses normalizedObject instead of object so it matches the
queue entry's key.

* fix(s3/versioning): short-circuit terminal errors in retryFilerOp

Add isRetryableFilerErr that returns false for filer_pb.ErrNotFound,
gRPC NotFound, context.Canceled, and context.DeadlineExceeded.
retryFilerOp now bails immediately on a terminal error and returns it
unwrapped, so callers like repointLatestBeforeDeletion.getEntry and
updateLatestVersionAfterDeletion.rm see the raw NotFound instead of
paying the ~6.3 s retry-budget delay AND parsing it out of an
"exhausted N retries" wrapper.

errors.Is and status.Code already walk the %w chain so today's call
sites still work, but the delay was real on the hot DELETE path
whenever a key was genuinely absent. Test added covering all five
terminal-error shapes — each must run the wrapped fn exactly once and
return in under 50 ms.
2026-05-13 10:14:27 -07:00

209 lines
7.1 KiB
Go

package s3api
import (
"context"
"errors"
"fmt"
"sync"
"time"
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
// Background reconciler for .versions/ directories whose latest-version
// pointer references a missing file. The inline delete path
// (deleteSpecificObjectVersion -> updateLatestVersionAfterDeletion) can
// leave this state behind if the second step (pointer update / dir rm)
// fails after the first (blob rm) succeeded. Read-path self-heal already
// recovers on the next GET, but that surfaces NoSuchKey to the client.
// The reconciler drains stranded entries proactively so a passing health
// check or an idle key gets repaired without waiting for a client read.
const (
versionsHealQueueCapacity = 4096
versionsHealPollInterval = 5 * time.Second
versionsHealMaxRetries = 6
versionsHealBaseBackoff = 200 * time.Millisecond
versionsHealMaxBackoff = 30 * time.Second
)
type versionsHealCandidate struct {
bucket string
object string
enqueued time.Time
attempts int
nextRetry time.Time
}
type versionsHealQueue struct {
mu sync.Mutex
pending map[string]*versionsHealCandidate
}
func newVersionsHealQueue() *versionsHealQueue {
return &versionsHealQueue{
pending: make(map[string]*versionsHealCandidate),
}
}
func versionsHealKey(bucket, object string) string {
return bucket + "/" + object
}
// Enqueue records that bucket/object's .versions/ directory may be in a
// stranded state and needs the reconciler to verify and heal it. Bounded
// by versionsHealQueueCapacity so a stuck filer can't grow the map
// without limit; on overflow we drop the newest candidate (the heal will
// run on the next read or the next delete-failure for that key).
func (q *versionsHealQueue) Enqueue(bucket, object string) {
q.mu.Lock()
defer q.mu.Unlock()
key := versionsHealKey(bucket, object)
if _, ok := q.pending[key]; ok {
return
}
if len(q.pending) >= versionsHealQueueCapacity {
glog.V(1).Infof("versionsHealQueue: capacity reached, dropping %s/%s", bucket, object)
return
}
q.pending[key] = &versionsHealCandidate{
bucket: bucket,
object: object,
enqueued: time.Now(),
nextRetry: time.Now(),
}
}
// popReady returns candidates whose nextRetry is in the past, removing
// them from the queue. Callers reinsert via requeue() if the heal failed.
func (q *versionsHealQueue) popReady(now time.Time) []*versionsHealCandidate {
q.mu.Lock()
defer q.mu.Unlock()
var out []*versionsHealCandidate
for k, c := range q.pending {
if !c.nextRetry.After(now) {
out = append(out, c)
delete(q.pending, k)
}
}
return out
}
// requeue re-inserts a candidate with an updated retry schedule. Drops
// candidates that have hit the attempt cap so they don't loop forever
// against a deterministically broken state; the read-path heal remains
// as a last-resort safety net.
func (q *versionsHealQueue) requeue(c *versionsHealCandidate, backoff time.Duration) {
if c.attempts >= versionsHealMaxRetries {
glog.Warningf("versionsHealQueue: giving up on %s/%s after %d attempts (read-path heal will still recover)", c.bucket, c.object, c.attempts)
return
}
q.mu.Lock()
defer q.mu.Unlock()
c.nextRetry = time.Now().Add(backoff)
q.pending[versionsHealKey(c.bucket, c.object)] = c
}
// Len returns the current queued size. Used in tests and by metrics.
func (q *versionsHealQueue) Len() int {
q.mu.Lock()
defer q.mu.Unlock()
return len(q.pending)
}
// startVersioningReconciler launches the background worker. Returns a
// stop function that the server's Shutdown calls to cancel the loop.
func (s3a *S3ApiServer) startVersioningReconciler() (stop func()) {
if s3a.versionsHealQueue == nil {
s3a.versionsHealQueue = newVersionsHealQueue()
}
ctx, cancel := context.WithCancel(context.Background())
go s3a.runVersioningReconciler(ctx)
return cancel
}
func (s3a *S3ApiServer) runVersioningReconciler(ctx context.Context) {
ticker := time.NewTicker(versionsHealPollInterval)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
return
case <-ticker.C:
s3a.drainVersionsHealQueue()
}
}
}
func (s3a *S3ApiServer) drainVersionsHealQueue() {
q := s3a.versionsHealQueue
if q == nil {
return
}
ready := q.popReady(time.Now())
for _, c := range ready {
c.attempts++
if err := s3a.healVersionsPointer(c.bucket, c.object); err != nil {
backoff := versionsHealBaseBackoff << uint(c.attempts-1)
if backoff > versionsHealMaxBackoff {
backoff = versionsHealMaxBackoff
}
glog.V(1).Infof("versionsHealQueue: heal failed for %s/%s (attempt %d): %v; retry in %v", c.bucket, c.object, c.attempts, err, backoff)
q.requeue(c, backoff)
continue
}
glog.V(1).Infof("versionsHealQueue: healed %s/%s after %d attempt(s) (queued for %v)", c.bucket, c.object, c.attempts, time.Since(c.enqueued))
}
}
// healVersionsPointer reads the .versions directory entry for the given
// object and, if its latest-version pointer references a file that does
// not exist, invokes the same self-heal path used by the read flow. A
// genuinely-missing .versions directory or an already-consistent pointer
// is treated as success — the candidate either healed itself via another
// path or was never in trouble.
//
// Transient errors from the filer (timeout, brief unreachability) are
// returned so the reconciler retries with backoff rather than silently
// evicting the candidate. Swallowing them as "no stranded state" would
// defeat the reconciler for exactly the failure modes the PR targets.
func (s3a *S3ApiServer) healVersionsPointer(bucket, object string) error {
bucketDir := s3a.bucketDir(bucket)
versionsObjectPath := object + s3_constants.VersionsFolder
versionsEntry, err := s3a.getEntry(bucketDir, versionsObjectPath)
if err != nil {
if errors.Is(err, filer_pb.ErrNotFound) || status.Code(err) == codes.NotFound {
// Directory is gone — no stranded state to heal.
return nil
}
return fmt.Errorf("read .versions entry %s/%s: %w", bucket, object, err)
}
if versionsEntry == nil || versionsEntry.Extended == nil {
return nil
}
fileBytes, hasFile := versionsEntry.Extended[s3_constants.ExtLatestVersionFileNameKey]
if !hasFile || len(fileBytes) == 0 {
// No pointer => no stranded state.
return nil
}
latestFile := string(fileBytes)
if _, probeErr := s3a.getEntry(bucketDir+"/"+versionsObjectPath, latestFile); probeErr == nil {
// Pointer is consistent.
return nil
} else if !errors.Is(probeErr, filer_pb.ErrNotFound) && status.Code(probeErr) != codes.NotFound {
// Transient — surface so the reconciler retries with backoff
// rather than invoking heal on a possibly-incomplete listing
// (which could rewrite the pointer to an older version).
return fmt.Errorf("probe latest version %s/%s/%s: %w", bucket, object, latestFile, probeErr)
}
// Reuse the read-path heal so behaviour stays identical: it will
// repair the pointer to the newest remaining version, or clear it
// when nothing valid remains.
_, healErr := s3a.healStaleLatestVersionPointer(bucket, object, versionsEntry, latestFile)
return healErr
}