mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-18 13:17:08 +00:00
Chris LuandGitHub
10cc06333b
Ping previously dialled whatever host:port the caller asked for. Gate each server's Ping handler on cluster membership: masters check the topology, registered cluster nodes, and configured master peers; volume servers only accept their seed/current masters; filers accept tracked peer filers, the master-learned volume server set, and configured masters. Use address-indexed peer lookups to keep Ping target validation O(1): - topology maintains a pb.ServerAddress -> *DataNode index alongside the dc/rack/node tree, kept in sync from doLinkChildNode and UnlinkChildNode plus the ip/port-rewrite branch in GetOrCreateDataNode. GetTopology now returns nil on a detached subtree instead of panicking, so the linkage hooks can no-op safely. - vid_map tracks a refcount per volume-server address so hasVolumeServer answers without scanning every vid location. The add path skips empty-address entries the same way the delete path already does, so a zero-value Location cannot leak a permanent serverRefCount[""] bucket. - masters reuse a cached master-address set from MasterClient instead of walking the configured peer slice on every request. - volume servers compare against a pre-built seed-master set and protect currentMaster reads/writes with an RWMutex, fixing the data race with the heartbeat goroutine. The seed slice is copied on construction so external mutation cannot desync it from the frozen lookup set. - cluster.check drops the direct volume-to-volume sweep; volume servers no longer carry a peer-volume list, and the note next to the dropped probe is reworded to make clear that direct volume-to-volume reachability is intentionally not validated by this command. Update the volume-server integration tests that drove Ping through the new admission gate: success-path coverage now targets the master peer (the only type a volume server tracks), and the unknown/unreachable path asserts the InvalidArgument the gate now returns instead of the old downstream dial error. Mirror the same admission gate in the Rust volume server crate: a seed-master HashSet built once at startup plus a tokio RwLock over the heartbeat-tracked current master, both consulted in is_known_ping_target on every Ping, with InvalidArgument returned for any target that isn't a recognised master.
67 lines
1.7 KiB
Go
67 lines
1.7 KiB
Go
package cluster
|
|
|
|
import (
|
|
"strconv"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
)
|
|
|
|
func TestConcurrentAddRemoveNodes(t *testing.T) {
|
|
c := NewCluster()
|
|
var wg sync.WaitGroup
|
|
for i := 0; i < 50; i++ {
|
|
wg.Add(1)
|
|
go func(i int) {
|
|
defer wg.Done()
|
|
address := strconv.Itoa(i)
|
|
c.AddClusterNode("", "filer", "", "", pb.ServerAddress(address), "23.45")
|
|
}(i)
|
|
}
|
|
wg.Wait()
|
|
|
|
for i := 0; i < 50; i++ {
|
|
wg.Add(1)
|
|
go func(i int) {
|
|
defer wg.Done()
|
|
address := strconv.Itoa(i)
|
|
node := c.RemoveClusterNode("", "filer", pb.ServerAddress(address))
|
|
|
|
if len(node) == 0 {
|
|
t.Errorf("TestConcurrentAddRemoveNodes: node[%s] not found", address)
|
|
return
|
|
} else if node[0].ClusterNodeUpdate.Address != address {
|
|
t.Errorf("TestConcurrentAddRemoveNodes: expect:%s, actual:%s", address, node[0].ClusterNodeUpdate.Address)
|
|
return
|
|
}
|
|
}(i)
|
|
}
|
|
wg.Wait()
|
|
}
|
|
|
|
func TestIsKnownNode(t *testing.T) {
|
|
c := NewCluster()
|
|
filer := pb.ServerAddress("10.0.0.20:8888")
|
|
c.AddClusterNode("", FilerType, "dc1", "rack1", filer, "test")
|
|
|
|
if !c.IsKnownNode(FilerType, filer) {
|
|
t.Fatalf("registered filer %s should be known", filer)
|
|
}
|
|
if c.IsKnownNode(VolumeServerType, filer) {
|
|
t.Fatalf("filer address must not be accepted as a volume server target")
|
|
}
|
|
if c.IsKnownNode(FilerType, pb.ServerAddress("127.0.0.1:1")) {
|
|
t.Fatalf("unregistered low-port target must be rejected")
|
|
}
|
|
if c.IsKnownNode(FilerType, pb.ServerAddress("127.0.0.1:65000")) {
|
|
t.Fatalf("unregistered high-port target must be rejected")
|
|
}
|
|
if c.IsKnownNode(FilerType, pb.ServerAddress("example.com:443")) {
|
|
t.Fatalf("unrelated host must be rejected")
|
|
}
|
|
if c.IsKnownNode("garbage", filer) {
|
|
t.Fatalf("unknown node type must be rejected")
|
|
}
|
|
}
|