mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-25 14:30:43 +01:00
* filer: do not stall startup waiting out the leader-settle window ListExistingPeerUpdates re-polled the leader for up to 10s when it reported zero filers. A fresh single-filer cluster can never gain peers, so every filer start paid the full settle timeout before listening — past the 6s health window in weed mini and short probe budgets. Take the leader's first answer instead; the fallback fullest-answer scan below still covers a leader that is mid-convergence. * filer: bound leader-settle re-poll below the startup health window * filer: update ListExistingPeerUpdates doc for empty-leader fallback * filer: re-check empty membership at the announce gate before registering A fresh filer that scans empty membership during a master restart or re-election skipped bootstrap and announced immediately, serving missing files until a peer happened to reconnect — and a late peer only got an incremental subscription, so pre-existing metadata was never backfilled. The announce gate now re-polls ListExistingPeerUpdates while the scan can still be disproved (10s), backfills from any late peers before their streams start, and then waits for their catch-up like startup peers. A genuinely empty cluster pays a delayed master listing rather than a stalled startup, since this runs after the ports already serve. * filer: overlap the late-peer copy cutoff and stream start A peer event stamped just behind this filer's clock could land after the traversal read but carry a timestamp below the stream start — the startup scan margins both cutoffs by LogFlushInterval for exactly this skew; mirror it for peers discovered at the announce gate. * filer: bound the late-peer bootstrap copy by the shared announce deadline MaybeBootstrapFromOnePeer now takes the caller's context so a stalled peer metadata copy cannot out-wait the announce cap, and the bootstrap re-check shares one announceCatchUpCap deadline with the catch-up wait instead of each spending a full minute. * filer: merge bootstrap entries by commit time instead of blind insert The late-peer copy runs while gRPC already serves, so a blind InsertEntry could replace a write the local filer just accepted. Routing each entry through applyTraversedEntry orders it against the local commit time under the replay locks — a fresher local write survives the backfill. --------- Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
142 lines
3.4 KiB
Go
142 lines
3.4 KiB
Go
package filer_pb
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
func TraverseBfs(ctx context.Context, filerClient FilerClient, parentPath util.FullPath, fn func(parentPath util.FullPath, entry *Entry) error) (err error) {
|
|
K := 5
|
|
|
|
// callers hand in user-typed paths, and every entry is reported relative
|
|
// to this one, so a trailing slash must not reach the callback
|
|
parentPath = util.NormalizePath(string(parentPath))
|
|
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
|
|
queue := util.NewQueue[util.FullPath]()
|
|
var pending sync.WaitGroup
|
|
pending.Add(1)
|
|
queue.Enqueue(parentPath)
|
|
|
|
var once sync.Once
|
|
var firstErr error
|
|
|
|
// A directory delivered twice (a page-boundary race with concurrent
|
|
// renames, or a store whose listing order misbehaves) must not be walked
|
|
// twice: the second walk re-lists the same subtree and can keep the
|
|
// traversal from ever terminating.
|
|
var visited sync.Map
|
|
visited.Store(string(parentPath), struct{}{})
|
|
|
|
enqueue := func(p util.FullPath) bool {
|
|
// Stop expanding traversal once canceled (e.g. first error encountered).
|
|
if ctx.Err() != nil {
|
|
return false
|
|
}
|
|
if _, seen := visited.LoadOrStore(string(p), struct{}{}); seen {
|
|
return true
|
|
}
|
|
pending.Add(1)
|
|
queue.Enqueue(p)
|
|
return true
|
|
}
|
|
|
|
done := make(chan struct{})
|
|
var workers sync.WaitGroup
|
|
for i := 0; i < K; i++ {
|
|
workers.Add(1)
|
|
go func() {
|
|
defer workers.Done()
|
|
for {
|
|
select {
|
|
case <-done:
|
|
return
|
|
default:
|
|
}
|
|
|
|
dir := queue.Dequeue()
|
|
if dir == "" {
|
|
// queue is empty for now
|
|
select {
|
|
case <-done:
|
|
return
|
|
case <-time.After(50 * time.Millisecond):
|
|
continue
|
|
}
|
|
}
|
|
|
|
// Always mark the directory as done so the closer can finish.
|
|
if ctx.Err() == nil {
|
|
processErr := processOneDirectory(ctx, filerClient, dir, enqueue, fn)
|
|
if processErr != nil {
|
|
once.Do(func() {
|
|
firstErr = processErr
|
|
cancel()
|
|
})
|
|
}
|
|
}
|
|
pending.Done()
|
|
}
|
|
}()
|
|
}
|
|
|
|
pending.Wait()
|
|
close(done)
|
|
|
|
workers.Wait()
|
|
|
|
return firstErr
|
|
}
|
|
|
|
func processOneDirectory(ctx context.Context, filerClient FilerClient, parentPath util.FullPath, enqueue func(p util.FullPath) bool, fn func(parentPath util.FullPath, entry *Entry) error) (err error) {
|
|
|
|
return ReadDirAllEntries(ctx, filerClient, parentPath, "", func(entry *Entry, isLast bool) error {
|
|
|
|
if err := fn(parentPath, entry); err != nil {
|
|
return err
|
|
}
|
|
|
|
if entry.IsDirectory {
|
|
if !enqueue(parentPath.Child(entry.Name)) {
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
}
|
|
|
|
func StreamBfs(ctx context.Context, client SeaweedFilerClient, dir util.FullPath, olderThanTsNs int64, fn func(parentPath util.FullPath, entry *Entry, entryTsNs int64) error) (err error) {
|
|
glog.V(0).Infof("TraverseBfsMetadata %v if before %v", dir, time.Unix(0, olderThanTsNs))
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
stream, err := client.TraverseBfsMetadata(ctx, &TraverseBfsMetadataRequest{
|
|
Directory: string(dir),
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("traverse bfs metadata: %w", err)
|
|
}
|
|
for {
|
|
resp, err := stream.Recv()
|
|
if err != nil {
|
|
if err == io.EOF {
|
|
break
|
|
}
|
|
return fmt.Errorf("traverse bfs metadata: %w", err)
|
|
}
|
|
if err := fn(util.FullPath(resp.Directory), resp.Entry, resp.EntryTsNs); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|