Files
seaweedfs/weed/wdclient/masterclient_move_test.go
T
Chris LuandClaude Opus 5.5 3a8d756bdd s3: drop retired volume servers from the gateway location cache (#12281)
* wdclient: publish applied volume-location deletes to registered listeners

The master already tells each connected client which volumes a server
stopped hosting; only the MasterClient's own vidMap applied it. Expose
the same filtered deletions (moves between a server's disks excluded)
through OnVolumeLocationDelete so clients keeping a second location
cache can drop the retired server too.

* wdclient: drop retired volume servers from the FilerClient location cache

The S3 gateway's FilerClient keeps its own vidMap, filled by filer
lookups, and only forgot a retired volume server after a read against
it failed (a ~15s header-timeout stall when the host still resolves).
When built with a MasterClient, subscribe to its applied deletions so
the cache forgets the server as soon as the master reports it gone.

* wdclient: drop retired EC servers from the regular location map too

Filer lookups cache EC locations alongside regular ones in vid2Locations,
so an EC removal has to clear the retired server there as well as in the
EC map for the delete to reach what reads actually use.

* wdclient: tombstone pushed deletions against in-flight provider fills

A filer lookup already running when a delete lands can return the retired
location afterwards and re-cache it. Keep a short tombstone on each
deleted (vid, url) pair so fills neither cache nor return it while the
lookup source is still settling.

* wdclient: clear the FilerClient location cache on master reconnect

Removals the master pushed while the gateway link was down never arrive
as deletes, so on reconnect the lookup-fed cache is dropped outright
rather than kept generation-wise like the stream-fed one, and relearned
through filer lookups as before.

* wdclient: invoke push hooks outside their registration locks

A callback that registers or replaces a hook would wait on the read lock
the invocation already holds and stall the master stream. Copy the hook
under the lock and call it after the lock is released.

* wdclient: report pushed adds so confirmed re-adds clear the suppression

A server coming back at the same URL inside the tombstone window stayed
hidden from provider fills. updateVidMap now carries the additions it
applied through the same hook (renamed OnVolumeLocationChange), and the
registered cache untombstones them without eagerly caching them.

* wdclient: amortize tombstone expiry over a delete batch

A server leaving takes every volume it hosted with it, and scanning all
recentDeletes per removed vid squared the batch. Prune lazily on reads
and at most once per half TTL on writes.

* wdclient: let every location cache subscribe to pushed volume changes

The setters were single-slot, so a second FilerClient built on the same
MasterClient would have silently replaced the first one's subscription.
Registration now returns an unhook func, delivered to all listeners, and
FilerClient.Close releases its own.

* wdclient: hold the deletion fence until the master re-confirms a location

* wdclient: check the deletion fence and the cache add under one lock

* wdclient: drop provider answers that crossed a cache reset

* wdclient: bound the deletion fence by evicting its oldest mark

* wdclient: refresh a repeated removal instead of evicting another mark

* wdclient: evict the oldest deletion-fence mark in constant time

* wdclient: fence a server only once it serves the volume in no form

ec.encode registers the shards before the regular copy is deleted from the
same server, and ec.decode mounts the regular copy before the shards come
off it. Both arrive add-first in separate heartbeats, so the later removal
tombstoned a (vid, url) pair the server still serves and dropped it from
the FilerClient map; the filer's answer naming that server was then fenced
out and the volume read as not found until the gateway reconnected.

Tombstone and report a removal only when neither map still names the url
for that volume.

* wdclient: serve a provider answer that crossed a cache reset

The answer is as fresh as the provider's view; only the cache it would
land in has been re-told. Dropping it failed every read whose lookup was
in flight during a master reconnect with 'volume not found'. Return it
and leave the new view to be filled by the next lookup.

* wdclient: test the moved volume whose old server keeps proxying

* wdclient: stop caching inside the master lookup provider

The provider wrote every answered location through addLocation, which
clears the deletion fence: a lookup still naming a server a pushed delete
had just retired untombstoned and re-cached it. Fallback lookups already
gate caching through fillLocation, and authoritative lookups bypass the
cache by contract, so the provider no longer writes the map at all.

* wdclient: count only master-pushed locations when suppressing a removal

hasLocation could not tell a confirmed regular copy from a lookup fill:
the master answers an EC volume with its shard servers, so the regular map
holds shard locations that arrived by lookup, and entries an earlier
generation learned linger past a reconnect. An EC removal whose url still
showed either was suppressed, leaving the retired server served.

The vid map now records the generation each regular location was pushed
at, drops an unconfirmed regular entry alongside the shard that fed it,
and answers hasServingLocation from pushed marks and current-generation
entries only.

* wdclient: test removals against lookup-cached and stale locations

* wdclient: fence removals only in the gateway cache

The fence and the pushed-location marks ran inside every MasterClient,
including the filer's, whose map is also filled by lookups and cleared
by InvalidateCache. A removal reported while the server still served the
volume (e.g. a decoded copy whose mark a failed read had wiped) left the
pair fenced until the master pushed it again, with reads failing as
volume not found meanwhile.

Only the S3 gateway's FilerClient now tombstones, from the removals its
push-only MasterClient reports. That client decides a removal from the
current generation of both its maps after the whole message is applied,
so pushedLocations goes away, and the master lookup provider caches as
before. The hooks follow the existing single-slot SetOn...Fn pattern and
are wired next to SetOnPeerUpdateFn.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* wdclient: let a removal fence expire after a minute

The master drops a broadcast when a client's channel is full, so the
re-add that would lift a fence can be lost while the gateway stays
connected. A mark held until that re-add then hid a live server, and a
volume whose only copy it held read as not found until the next master
reconnect. Bounding marks by a minute still outlasts a lookup in flight
when the removal landed; expiring early only falls back to learning by a
failed read, as before this change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 15:05:00 -07:00

181 lines
6.2 KiB
Go

package wdclient
import (
"testing"
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
)
func moveClient() *MasterClient {
return &MasterClient{vidMapClient: newVidMapClient(nil, "", 0)}
}
func moveResponse(newVids, deletedVids []uint32) *master_pb.KeepConnectedResponse {
return &master_pb.KeepConnectedResponse{VolumeLocation: &master_pb.VolumeLocation{
Url: "server:8080", PublicUrl: "server:8080", NewVids: newVids, DeletedVids: deletedVids,
}}
}
// A volume moved between a server's disks arrives added and removed at once,
// and the server still has it.
func TestMovedVolumeKeepsItsLocation(t *testing.T) {
mc := moveClient()
mc.updateVidMap(moveResponse([]uint32{1}, nil))
mc.updateVidMap(moveResponse([]uint32{1}, []uint32{1}))
locations, found := mc.GetLocations(1)
if !found || len(locations) != 1 {
t.Errorf("a volume that moved between its server's disks lost its location: found=%v %v", found, locations)
}
}
func TestRemovedVolumeLosesItsLocation(t *testing.T) {
mc := moveClient()
mc.updateVidMap(moveResponse([]uint32{1}, nil))
mc.updateVidMap(moveResponse(nil, []uint32{1}))
if locations, found := mc.GetLocations(1); found && len(locations) > 0 {
t.Errorf("a volume that left the server kept its location: %v", locations)
}
}
func TestReadOnlyVolumeUpdatesItsLocation(t *testing.T) {
mc := moveClient()
mc.updateVidMap(moveResponse([]uint32{1}, nil))
mc.updateVidMap(&master_pb.KeepConnectedResponse{VolumeLocation: &master_pb.VolumeLocation{
Url: "server:8080", PublicUrl: "server:8080", NewVids: []uint32{1}, ReadOnlyVids: []uint32{1},
}})
locations, found := mc.GetLocations(1)
if !found || len(locations) != 1 || !locations[0].ReadOnly {
t.Fatalf("read-only update = %v, want one read-only location", locations)
}
}
// Removals of other volumes in the same message must still apply.
func TestRemovalsAlongsideAMoveStillApply(t *testing.T) {
mc := moveClient()
mc.updateVidMap(moveResponse([]uint32{1, 2}, nil))
mc.updateVidMap(moveResponse([]uint32{1}, []uint32{1, 2}))
if locations, found := mc.GetLocations(1); !found || len(locations) != 1 {
t.Errorf("the moved volume lost its location: found=%v %v", found, locations)
}
if locations, found := mc.GetLocations(2); found && len(locations) > 0 {
t.Errorf("a volume that left the server kept its location: %v", locations)
}
}
func moveEcResponse(newEcVids, deletedEcVids []uint32) *master_pb.KeepConnectedResponse {
return &master_pb.KeepConnectedResponse{VolumeLocation: &master_pb.VolumeLocation{
Url: "server:8080", PublicUrl: "server:8080", NewEcVids: newEcVids, DeletedEcVids: deletedEcVids,
}}
}
func TestEcVolumeMovedKeepsItsLocation(t *testing.T) {
mc := moveClient()
mc.updateVidMap(moveEcResponse([]uint32{7}, nil))
mc.updateVidMap(moveEcResponse([]uint32{7}, []uint32{7}))
if locations, found := mc.GetLocations(7); !found || len(locations) != 1 {
t.Errorf("an ec volume reported both ways lost its location: found=%v %v", found, locations)
}
}
func TestEcVolumeRemovedLosesItsLocation(t *testing.T) {
mc := moveClient()
mc.updateVidMap(moveEcResponse([]uint32{7}, nil))
mc.updateVidMap(moveEcResponse(nil, []uint32{7}))
if locations, found := mc.GetLocations(7); found && len(locations) > 0 {
t.Errorf("an ec volume that left the server kept its location: %v", locations)
}
}
func listenForChanges(mc *MasterClient) (adds, dels *[]uint32) {
adds, dels = new([]uint32), new([]uint32)
mc.SetOnVolumeLocationChangeFn(func(_ Location, addedVids, deletedVids []uint32) {
*adds = append(*adds, addedVids...)
*dels = append(*dels, deletedVids...)
})
return adds, dels
}
func pushVolumeLocation(mc *MasterClient, url string, newVids, deletedVids, newEcVids, deletedEcVids []uint32) {
mc.updateVidMap(&master_pb.KeepConnectedResponse{VolumeLocation: &master_pb.VolumeLocation{
Url: url, PublicUrl: url, NewVids: newVids, DeletedVids: deletedVids, NewEcVids: newEcVids, DeletedEcVids: deletedEcVids,
}})
}
// A volume moved between the server's disks arrives as an add, never a removal.
func TestChangeListenerHearsAppliedChanges(t *testing.T) {
mc := moveClient()
adds, dels := listenForChanges(mc)
mc.updateVidMap(moveResponse([]uint32{1}, []uint32{1, 2}))
if len(*adds) != 1 || (*adds)[0] != 1 {
t.Errorf("listener heard adds %v, want [1]", *adds)
}
if len(*dels) != 1 || (*dels)[0] != 2 {
t.Errorf("listener heard removals %v, want [2]", *dels)
}
}
func TestChangeListenerSkipsRemovalWhileOtherFormServes(t *testing.T) {
mc := moveClient()
_, dels := listenForChanges(mc)
pushVolumeLocation(mc, "server:8080", []uint32{1}, nil, []uint32{1}, nil)
pushVolumeLocation(mc, "server:8080", nil, nil, nil, []uint32{1})
if len(*dels) != 0 {
t.Fatalf("shard removal reported while the regular copy stays: %v", *dels)
}
pushVolumeLocation(mc, "server:8080", nil, []uint32{1}, nil, nil)
if len(*dels) != 1 || (*dels)[0] != 1 {
t.Errorf("last form removed but listener heard %v, want [1]", *dels)
}
}
// The shards and the regular copy's removal can share one message, where
// the removal is applied before the shards are added.
func TestChangeListenerSkipsRemovalReplacedInSameMessage(t *testing.T) {
mc := moveClient()
pushVolumeLocation(mc, "server:8080", []uint32{1}, nil, nil, nil)
_, dels := listenForChanges(mc)
pushVolumeLocation(mc, "server:8080", nil, []uint32{1}, []uint32{1}, nil)
if len(*dels) != 0 {
t.Errorf("regular copy replaced by shards in one message reported removed: %v", *dels)
}
}
// Shards only an earlier master generation reported do not keep a server
// alive once the regular copy goes.
func TestChangeListenerIgnoresStaleGenerationWhenSuppressing(t *testing.T) {
mc := moveClient()
pushVolumeLocation(mc, "server:8080", []uint32{1}, nil, []uint32{1}, nil)
mc.resetVidMap()
pushVolumeLocation(mc, "server:8080", []uint32{1}, nil, nil, nil)
_, dels := listenForChanges(mc)
pushVolumeLocation(mc, "server:8080", nil, []uint32{1}, nil, nil)
if len(*dels) != 1 || (*dels)[0] != 1 {
t.Errorf("listener heard removals %v, want [1]", *dels)
}
}
func TestResetVidMapNotifiesListener(t *testing.T) {
mc := moveClient()
resets := 0
mc.SetOnVidMapResetFn(func() { resets++ })
mc.resetVidMap()
if resets != 1 {
t.Errorf("reset listener heard %d resets, want 1", resets)
}
}