mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-29 11:15:34 +00:00
* cluster: never broadcast an empty lock ring An empty member list is never a usable ring state, but a delayed RemoveServer on a former leader can fire after the new leader already broadcast the recovered ring. That late broadcast carries a newer wall-clock version, so clients accept the empty ring and permanently reject the good one. Skip the broadcast entirely when the member list is empty, keeping the last non-empty snapshot for reconnecting clients. * cluster: periodically rebroadcast the lock ring Ring updates are purely event-driven, so one lost or poisoned update is permanent until the next membership change — with a single filer that may never come. Re-arm a per-group timer after every broadcast so the current leader keeps re-sending the ring; clients reject nothing newer than their last accepted version, so a re-sent snapshot always heals a stale view. * filer,s3api: reset the lock ring on master change Ring versions are per-master monotonic — each master stamps wall-clock nanoseconds — so a late high-version update accepted from a former leader makes the new leader's snapshot look stale forever. Detect a leader change across the reconnect gap (currentMaster is cleared between attempts, so remember the last served master) and reset the ring to bootstrap state so the new leader's view always applies. * cluster: fail lock acquisition when no lock server exists retryUntilLocked loops forever, so a filer reporting an empty lock ring wedges every append write indefinitely. Bound only the "no lock server found" case — ordinary contention is still waited out since the holder releases eventually. The constructors now return nil on failure: the filer append path and S3 object writes fail fast, while mounts degrade to their existing lockless mode. * cluster: reset only the ring version on master change Ring versions are per-master monotonic, so a version gate reset is all a leader change needs. Clearing the whole ring made every filer its own write owner until the next update and dropped the prior-owner window for keys the new leader remaps; the last ring now keeps routing until the new leader's snapshot transitions off it. * cluster: skip redundant ring installs and defer rebroadcasts An unchanged member list now only bumps the accepted version instead of installing a snapshot: periodic rebroadcasts no longer fire the topology-change callback or restart the prior-owner window. And a rebroadcast that lands inside a membership stabilization window yields to the pending timer rather than publishing an intermediate ring. * cluster,mount: bound lock unavailability, fail ops that cannot lock Only 'lock already owned' contention retries without bound now; every other failure — no lock server, or a dead ring member refusing connections — shares the same unavailability budget, so a ring naming departed filers can no longer hang a lock forever. Mount open-write, create, and rename fail with EAGAIN when the required lock cannot be acquired instead of proceeding without cross-mount serialization. * cluster: check pending stabilization inside the broadcast critical section rebroadcast released the mutex between the pending-timer check and nextBroadcastUpdate, so a membership change arriving in the gap could arm a stabilization timer while the rebroadcast emitted an intermediate ring. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: acquire path locks before mutating create/rename state Create took the DLM lock only after the filer create, so a lock failure returned EAGAIN with an eagerly persisted file left behind. Rename marked source handles renamed before acquiring locks, so a failed acquisition left them suppressing old-path flushes for a rename that never happened. Both now take the locks first; the create's lock is released again if the entry race loses to another creator and AcquireHandle takes over. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: keep the old-path lock when rename lock migration fails The migration stopped the handle's lock before acquiring the replacement, so a nil result left the handle writing with no lock at all. Acquiring the new-path lock first means failure keeps the existing lock instead of reporting success with serialization dropped. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: skip new-path rename lock when a handle already holds it A target file open for write on this mount already carries a lock on newPath; the lock manager does not grant a second lock to the same owner, so the rename would wait on itself until the handle closed. Also avoid locking twice when old and new paths coincide. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: hand the rename's target lock to the migrating handle The rename holds a lock on newPath for its duration, so the response migration's fresh acquisition waited on that same lock until the handle released — under fhLockTable, blocking the handle's own close. Adopt the rename's lock directly; nested move responses still acquire their own. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: move the replaced target's lock to the renamed handle When the target path was already locked by an open handle on this mount, the migrated source handle kept only its stale old-path lock — the target's close would then release the last lock on the new path while the renamed handle was still open. Adopt the replaced handle's lock instead. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: stop the handle lock inside the fh lock on release ReleaseHandle stopped fh.dlmLock before taking the fhLockTable slot, so a rename migration holding that slot could still observe and adopt a lock that was already stopping. Stopping under the fh lock makes the transfer serialize against the release. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: claim the replaced target's lock for the renamed handle When the target path is already locked by an open handle on this mount, adopting it at migration time keeps the renamed path protected after that handle closes, without waiting on a lock this mount already holds. If the handle was released mid-migration the claimed lock is stopped, and a fresh acquire covers the case where it was already gone. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: claim the target handle's lock before the rename runs Skipping the new-path lock when a handle already holds it let that handle's close release the lock mid-rename, leaving the path unguarded until the response migrated it. Take over the lock at check time and hold it for the rename's duration: the response adopts it for the migrating handle, or it returns to the target handle / is released on failure. The target handle lookup also falls back to the entry's stored inode for a forgotten path mapping. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mount: read handle locks only under the fh lock during rename The loose dlmLock reads raced ReleaseHandle, which now mutates the lock inside the handle lock; check and claim it under the same hold. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
219 lines
7.4 KiB
Go
219 lines
7.4 KiB
Go
package cluster
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
)
|
|
|
|
const LockRingStabilizationInterval = 1 * time.Second
|
|
|
|
// LockRingRebroadcastInterval is how often the ring is re-sent even when
|
|
// membership has not changed. Broadcasts are otherwise purely event-driven,
|
|
// so a single lost or poisoned update would be permanent without this.
|
|
const LockRingRebroadcastInterval = 30 * time.Second
|
|
|
|
// LockRingManager tracks filer membership for the distributed lock ring.
|
|
// It batches rapid topology changes (e.g., node drop + join) with a
|
|
// stabilization timer, then broadcasts the complete member list atomically
|
|
// so filers receive a single consistent ring update instead of multiple
|
|
// intermediate states.
|
|
type LockRingManager struct {
|
|
mu sync.Mutex
|
|
members map[FilerGroupName]map[pb.ServerAddress]struct{}
|
|
version map[FilerGroupName]int64
|
|
lastBroadcast map[FilerGroupName]*master_pb.LockRingUpdate
|
|
pendingTimer map[FilerGroupName]*time.Timer
|
|
rebroadcastTimer map[FilerGroupName]*time.Timer
|
|
broadcastFn func(resp *master_pb.KeepConnectedResponse)
|
|
stabilizeDelay time.Duration
|
|
rebroadcastInterval time.Duration
|
|
}
|
|
|
|
func NewLockRingManager(broadcastFn func(resp *master_pb.KeepConnectedResponse)) *LockRingManager {
|
|
return &LockRingManager{
|
|
members: make(map[FilerGroupName]map[pb.ServerAddress]struct{}),
|
|
version: make(map[FilerGroupName]int64),
|
|
lastBroadcast: make(map[FilerGroupName]*master_pb.LockRingUpdate),
|
|
pendingTimer: make(map[FilerGroupName]*time.Timer),
|
|
rebroadcastTimer: make(map[FilerGroupName]*time.Timer),
|
|
broadcastFn: broadcastFn,
|
|
stabilizeDelay: LockRingStabilizationInterval,
|
|
rebroadcastInterval: LockRingRebroadcastInterval,
|
|
}
|
|
}
|
|
|
|
// AddServer records a filer joining and schedules a batched broadcast.
|
|
func (lrm *LockRingManager) AddServer(filerGroup FilerGroupName, address pb.ServerAddress) {
|
|
lrm.mu.Lock()
|
|
defer lrm.mu.Unlock()
|
|
|
|
if _, ok := lrm.members[filerGroup]; !ok {
|
|
lrm.members[filerGroup] = make(map[pb.ServerAddress]struct{})
|
|
}
|
|
lrm.members[filerGroup][address] = struct{}{}
|
|
lrm.scheduleBroadcast(filerGroup)
|
|
}
|
|
|
|
// RemoveServer records a filer leaving and schedules a batched broadcast.
|
|
func (lrm *LockRingManager) RemoveServer(filerGroup FilerGroupName, address pb.ServerAddress) {
|
|
lrm.mu.Lock()
|
|
defer lrm.mu.Unlock()
|
|
|
|
if members, ok := lrm.members[filerGroup]; ok {
|
|
delete(members, address)
|
|
}
|
|
lrm.scheduleBroadcast(filerGroup)
|
|
}
|
|
|
|
// GetServers returns the current member list for a filer group.
|
|
func (lrm *LockRingManager) GetServers(filerGroup FilerGroupName) []string {
|
|
lrm.mu.Lock()
|
|
defer lrm.mu.Unlock()
|
|
|
|
members, ok := lrm.members[filerGroup]
|
|
if !ok {
|
|
return nil
|
|
}
|
|
servers := make([]string, 0, len(members))
|
|
for addr := range members {
|
|
servers = append(servers, string(addr))
|
|
}
|
|
return servers
|
|
}
|
|
|
|
// GetVersion returns the current version for a filer group.
|
|
func (lrm *LockRingManager) GetVersion(filerGroup FilerGroupName) int64 {
|
|
lrm.mu.Lock()
|
|
defer lrm.mu.Unlock()
|
|
return lrm.version[filerGroup]
|
|
}
|
|
|
|
// GetLastUpdate returns a copy of the most recently broadcast lock-ring snapshot
|
|
// for the filer group. It intentionally does not expose pending, unstabilized changes.
|
|
func (lrm *LockRingManager) GetLastUpdate(filerGroup FilerGroupName) *master_pb.LockRingUpdate {
|
|
lrm.mu.Lock()
|
|
defer lrm.mu.Unlock()
|
|
|
|
update, ok := lrm.lastBroadcast[filerGroup]
|
|
if !ok || update == nil {
|
|
return nil
|
|
}
|
|
cp := *update
|
|
cp.Servers = append([]string(nil), update.Servers...)
|
|
return &cp
|
|
}
|
|
|
|
// scheduleBroadcast resets the stabilization timer. If another change arrives
|
|
// before the timer fires, the timer resets, batching the changes.
|
|
// Caller must hold lrm.mu.
|
|
func (lrm *LockRingManager) scheduleBroadcast(filerGroup FilerGroupName) {
|
|
if timer, ok := lrm.pendingTimer[filerGroup]; ok {
|
|
if !timer.Stop() {
|
|
// Timer already fired, callback is running or queued.
|
|
// It will pick up the latest state from lrm.members, so
|
|
// just schedule a new one for any further changes.
|
|
}
|
|
}
|
|
lrm.pendingTimer[filerGroup] = time.AfterFunc(lrm.stabilizeDelay, func() {
|
|
lrm.doBroadcast(filerGroup)
|
|
})
|
|
}
|
|
|
|
func (lrm *LockRingManager) doBroadcast(filerGroup FilerGroupName) {
|
|
lrm.mu.Lock()
|
|
delete(lrm.pendingTimer, filerGroup)
|
|
lrm.mu.Unlock()
|
|
lrm.emit(filerGroup)
|
|
}
|
|
|
|
// rebroadcast re-sends the current ring unless a membership broadcast is
|
|
// still stabilizing — emitting mid-window would publish an intermediate
|
|
// topology that the pending timer immediately replaces. The check and the
|
|
// update must sit in one critical section or a membership change can slip
|
|
// a pending timer in between.
|
|
func (lrm *LockRingManager) rebroadcast(filerGroup FilerGroupName) {
|
|
lrm.mu.Lock()
|
|
var update *master_pb.LockRingUpdate
|
|
if _, pending := lrm.pendingTimer[filerGroup]; !pending {
|
|
update = lrm.nextBroadcastUpdate(filerGroup)
|
|
}
|
|
lrm.mu.Unlock()
|
|
lrm.sendUpdate(filerGroup, update)
|
|
}
|
|
|
|
func (lrm *LockRingManager) emit(filerGroup FilerGroupName) {
|
|
lrm.mu.Lock()
|
|
update := lrm.nextBroadcastUpdate(filerGroup)
|
|
lrm.mu.Unlock()
|
|
lrm.sendUpdate(filerGroup, update)
|
|
}
|
|
|
|
func (lrm *LockRingManager) sendUpdate(filerGroup FilerGroupName, update *master_pb.LockRingUpdate) {
|
|
if update == nil {
|
|
return
|
|
}
|
|
glog.V(0).Infof("LockRing: broadcasting ring update for group %q version %d: %v", filerGroup, update.Version, update.Servers)
|
|
if lrm.broadcastFn != nil {
|
|
lrm.broadcastFn(&master_pb.KeepConnectedResponse{
|
|
LockRingUpdate: update,
|
|
})
|
|
}
|
|
}
|
|
|
|
// nextBroadcastUpdate stamps the current members into an update and re-arms
|
|
// the periodic rebroadcast. It returns nil for an empty member list: an empty
|
|
// lock ring is never usable, so a late "last member removed" event from a
|
|
// former leader must not propagate and wedge every lock client. The last
|
|
// non-empty broadcast stays in lastBroadcast for reconnecting clients.
|
|
// Caller must hold lrm.mu.
|
|
func (lrm *LockRingManager) nextBroadcastUpdate(filerGroup FilerGroupName) *master_pb.LockRingUpdate {
|
|
members := lrm.members[filerGroup]
|
|
if len(members) == 0 {
|
|
return nil
|
|
}
|
|
// Use wall-clock nanoseconds so the version survives master restarts
|
|
// without persistence — a restarted master produces a version greater
|
|
// than any pre-restart value (assuming clocks don't jump backward).
|
|
version := time.Now().UnixNano()
|
|
lrm.version[filerGroup] = version
|
|
servers := make([]string, 0, len(members))
|
|
for addr := range members {
|
|
servers = append(servers, string(addr))
|
|
}
|
|
update := &master_pb.LockRingUpdate{
|
|
FilerGroup: string(filerGroup),
|
|
Servers: append([]string(nil), servers...),
|
|
Version: version,
|
|
}
|
|
lrm.lastBroadcast[filerGroup] = update
|
|
if timer, ok := lrm.rebroadcastTimer[filerGroup]; ok {
|
|
timer.Stop()
|
|
}
|
|
lrm.rebroadcastTimer[filerGroup] = time.AfterFunc(lrm.rebroadcastInterval, func() {
|
|
lrm.rebroadcast(filerGroup)
|
|
})
|
|
return update
|
|
}
|
|
|
|
// FlushPending fires any pending timer immediately (for testing or shutdown).
|
|
func (lrm *LockRingManager) FlushPending(filerGroup FilerGroupName) {
|
|
lrm.mu.Lock()
|
|
if timer, ok := lrm.pendingTimer[filerGroup]; ok {
|
|
if timer.Stop() {
|
|
// Timer was pending — we stopped it, so we broadcast now
|
|
delete(lrm.pendingTimer, filerGroup)
|
|
lrm.mu.Unlock()
|
|
lrm.doBroadcast(filerGroup)
|
|
} else {
|
|
// Timer already fired, callback is running — let it finish
|
|
lrm.mu.Unlock()
|
|
}
|
|
} else {
|
|
lrm.mu.Unlock()
|
|
}
|
|
}
|