mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-08 15:41:15 +02:00
* proto: define MountRegister/MountList and MountPeer service Adds the wire types for peer chunk sharing between weed mount clients: * filer.proto: MountRegister / MountList RPCs so each mount can heartbeat its peer-serve address into a filer-hosted registry, and refresh the list of peers. Tiny payload; the filer stores only O(fleet_size) state. * mount_peer.proto (new): ChunkAnnounce / ChunkLookup RPCs for the mount-to-mount chunk directory. Each fid's directory entry lives on an HRW-assigned mount; announces and lookups route to that mount. No behavior yet — later PRs wire the RPCs into the filer and mount. See design-weed-mount-peer-chunk-sharing.md for the full design. * filer: add mount-server registry behind -peer.registry.enable Implements tier 1 of the peer chunk sharing design: an in-memory registry of live weed mount servers, keyed by peer address, refreshed by MountRegister heartbeats and served by MountList. * weed/filer/peer_registry.go: thread-safe map with TTL eviction; lazy sweep on List plus a background sweeper goroutine for bounded memory. * weed/server/filer_grpc_server_peer.go: MountRegister / MountList RPC handlers. When -peer.registry.enable is false (the default), both RPCs are silent no-ops so probing older filers is harmless. * -peer.registry.enable flag on weed filer; FilerOption.PeerRegistryEnabled wires it through. Phase 1 is single-filer (no cross-filer replication of the registry); mounts that fail over to another filer will re-register on the next heartbeat, so the registry self-heals within one TTL cycle. Part of the peer-chunk-sharing design; no behavior change at runtime until a later PR enables the flag on both filer and mount. * filer: nil-safe peerRegistryEnable + registry hardening Addresses review feedback on PR #9131. * Fix: nil pointer deref in the mini cluster. FilerOptions instances constructed outside weed/command/filer.go (e.g. miniFilerOptions in mini.go) do not populate peerRegistryEnable, so dereferencing the pointer panics at Filer startup. Use the same `nil && deref` idiom already used for distributedLock / writebackCache. * Hardening (gemini review): registry now enforces three invariants: - empty peer_addr is silently rejected (no client-controlled sentinel mass-inserts) - TTL is capped at 1 hour so a runaway client cannot pin entries - new-entry count is capped at 10000 to bound memory; renewals of existing entries are always honored, so a full registry still heartbeats its existing members correctly Covered by new unit tests. * filer: rename -peer.registry.enable flag to -mount.p2p Per review feedback: the old name "peer.registry.enable" leaked the implementation ("registry") into the CLI surface. "mount.p2p" is shorter and describes what it actually controls — whether this filer participates in mount-to-mount peer chunk sharing. Flag renames (all three keep default=true, idle cost is near-zero): -peer.registry.enable -> -mount.p2p (weed filer) -filer.peer.registry.enable -> -filer.mount.p2p (weed mini, weed server) Internal variable names (mountPeerRegistryEnable, MountPeerRegistry) keep their longer form — they describe the component, not the knob. * filer: MountList returns DataCenter + List uses RLock Two review follow-ups on the mount peer registry: * weed/server/filer_grpc_server_mount_peer.go: MountList was dropping the DataCenter on the wire. The whole point of carrying DC separately from Rack is letting the mount-side fetcher re-rank peers by the two-level locality hierarchy (same-rack > same-DC > cross-DC); without DC in the response every remote peer collapsed to "unknown locality." * weed/filer/mount_peer_registry.go: List() was taking a write lock so it could lazy-delete expired entries inline. But MountList is a read-heavy RPC hit on every mount's 30 s refresh loop, and Sweep is already wired as the sole reclamation path (same pattern as the mount-side PeerDirectory). Switch List to RLock + filter, let Sweep do the map mutation, so concurrent MountList callers don't serialize on each other. Test updated to reflect the new contract (List no longer mutates the map; Sweep is what drops expired entries).
142 lines
4.4 KiB
Go
142 lines
4.4 KiB
Go
package filer
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// maxMountPeerRegistryEntries caps the number of mounts the filer will track to
|
|
// prevent a burst of buggy or malicious clients from exhausting memory. At
|
|
// ~80 B per entry (map + struct + strings) a 10k cap costs ~1 MB, which is
|
|
// ample headroom for real fleets while being well under any filer's budget.
|
|
// A full registry silently rejects new registrations until expiry frees room.
|
|
const maxMountPeerRegistryEntries = 10000
|
|
|
|
// maxMountPeerRegistryTTL caps a single heartbeat's requested TTL. Prevents a
|
|
// misconfigured or malicious client from pinning an entry indefinitely.
|
|
const maxMountPeerRegistryTTL = time.Hour
|
|
|
|
// MountPeerRegistry is the in-memory mount-server registry (tier 1 of the peer
|
|
// chunk sharing design). The filer holds a map of mount-server address ->
|
|
// metadata with TTL-bounded entries refreshed by MountRegister heartbeats.
|
|
//
|
|
// The registry is small (O(fleet_size)) and slow-changing; fid-level state
|
|
// is NOT stored here — that lives on the mount fleet itself (tier 2).
|
|
//
|
|
// See design-weed-mount-peer-chunk-sharing.md §4.2.1.
|
|
type MountPeerRegistry struct {
|
|
mu sync.RWMutex
|
|
entries map[string]*mountPeerRegistryEntry
|
|
clock func() time.Time // injectable for tests
|
|
}
|
|
|
|
type mountPeerRegistryEntry struct {
|
|
peerAddr string
|
|
dataCenter string
|
|
rack string
|
|
expiry time.Time
|
|
lastSeen time.Time
|
|
}
|
|
|
|
// MountPeerInfo is the public view of a registered mount. DataCenter and
|
|
// Rack are carried as a two-level locality hierarchy: a peer in the same
|
|
// DC but a different rack is still a much better fetch target than a peer
|
|
// in a different DC, so both are worth distinguishing for ranking.
|
|
type MountPeerInfo struct {
|
|
PeerAddr string
|
|
DataCenter string
|
|
Rack string
|
|
LastSeenNs int64
|
|
}
|
|
|
|
// NewMountPeerRegistry constructs an empty registry using the real wall clock.
|
|
func NewMountPeerRegistry() *MountPeerRegistry {
|
|
return newMountPeerRegistryWithClock(time.Now)
|
|
}
|
|
|
|
func newMountPeerRegistryWithClock(clock func() time.Time) *MountPeerRegistry {
|
|
return &MountPeerRegistry{
|
|
entries: make(map[string]*mountPeerRegistryEntry),
|
|
clock: clock,
|
|
}
|
|
}
|
|
|
|
// Register inserts or renews an entry. A zero or negative ttl is treated as
|
|
// "use a sane default" (60 s); a ttl exceeding maxMountPeerRegistryTTL is capped.
|
|
// An empty peerAddr is rejected silently. When the registry is at capacity,
|
|
// a *new* entry is rejected; renewals of existing entries always succeed.
|
|
func (r *MountPeerRegistry) Register(peerAddr, dataCenter, rack string, ttl time.Duration) {
|
|
if peerAddr == "" {
|
|
return
|
|
}
|
|
if ttl <= 0 {
|
|
ttl = 60 * time.Second
|
|
}
|
|
if ttl > maxMountPeerRegistryTTL {
|
|
ttl = maxMountPeerRegistryTTL
|
|
}
|
|
now := r.clock()
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
entry, ok := r.entries[peerAddr]
|
|
if !ok {
|
|
if len(r.entries) >= maxMountPeerRegistryEntries {
|
|
return
|
|
}
|
|
entry = &mountPeerRegistryEntry{peerAddr: peerAddr}
|
|
r.entries[peerAddr] = entry
|
|
}
|
|
entry.dataCenter = dataCenter
|
|
entry.rack = rack
|
|
entry.lastSeen = now
|
|
entry.expiry = now.Add(ttl)
|
|
}
|
|
|
|
// List returns all entries that have not yet expired, in no particular
|
|
// order. Expired entries are filtered out of the response but NOT deleted
|
|
// here — Sweep handles that under a write lock on its own schedule. List
|
|
// is called on every mount's MountList refresh (30 s cadence per mount)
|
|
// so keeping it RLock-only lets concurrent callers proceed in parallel.
|
|
func (r *MountPeerRegistry) List() []MountPeerInfo {
|
|
now := r.clock()
|
|
r.mu.RLock()
|
|
defer r.mu.RUnlock()
|
|
result := make([]MountPeerInfo, 0, len(r.entries))
|
|
for _, entry := range r.entries {
|
|
if !entry.expiry.After(now) {
|
|
continue // Sweep will clean this up
|
|
}
|
|
result = append(result, MountPeerInfo{
|
|
PeerAddr: entry.peerAddr,
|
|
DataCenter: entry.dataCenter,
|
|
Rack: entry.rack,
|
|
LastSeenNs: entry.lastSeen.UnixNano(),
|
|
})
|
|
}
|
|
return result
|
|
}
|
|
|
|
// Len returns the current entry count (including entries that may have
|
|
// expired but not yet been swept).
|
|
func (r *MountPeerRegistry) Len() int {
|
|
r.mu.RLock()
|
|
defer r.mu.RUnlock()
|
|
return len(r.entries)
|
|
}
|
|
|
|
// Sweep removes expired entries. Safe to call periodically. Returns the
|
|
// number of entries evicted.
|
|
func (r *MountPeerRegistry) Sweep() int {
|
|
now := r.clock()
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
evicted := 0
|
|
for addr, entry := range r.entries {
|
|
if !entry.expiry.After(now) {
|
|
delete(r.entries, addr)
|
|
evicted++
|
|
}
|
|
}
|
|
return evicted
|
|
}
|