diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 00:13:57 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 00:13:57 +0500 |
| commit | d8925b4e832b9ed12deae0b9b94cd5f050f2f258 (patch) | |
| tree | a197c8619048285e87c89932666ec0c7b2434f40 /weed/cluster/cluster_test.go | |
| parent | 7640e650e5e647e6d6f3c8043c1e0a7442f154c7 (diff) | |
| parent | 998c1973eae6cbf5f91a80d3d6a864db91a3d38f (diff) | |
| download | seaweedfs-d8925b4e832b9ed12deae0b9b94cd5f050f2f258.tar.xz seaweedfs-d8925b4e832b9ed12deae0b9b94cd5f050f2f258.zip | |
Merge branch 'new_master' into ydb
# Conflicts:
# go.mod
# go.sum
Diffstat (limited to 'weed/cluster/cluster_test.go')
| -rw-r--r-- | weed/cluster/cluster_test.go | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/weed/cluster/cluster_test.go b/weed/cluster/cluster_test.go index b56ee501c..ccaccf6f7 100644 --- a/weed/cluster/cluster_test.go +++ b/weed/cluster/cluster_test.go @@ -9,39 +9,39 @@ import ( func TestClusterAddRemoveNodes(t *testing.T) { c := NewCluster() - c.AddClusterNode("filer", pb.ServerAddress("111:1"), "23.45") - c.AddClusterNode("filer", pb.ServerAddress("111:2"), "23.45") + c.AddClusterNode("", "filer", pb.ServerAddress("111:1"), "23.45") + c.AddClusterNode("", "filer", pb.ServerAddress("111:2"), "23.45") assert.Equal(t, []pb.ServerAddress{ pb.ServerAddress("111:1"), pb.ServerAddress("111:2"), - }, c.filerLeaders.GetLeaders()) + }, c.getFilers("", false).leaders.GetLeaders()) - c.AddClusterNode("filer", pb.ServerAddress("111:3"), "23.45") - c.AddClusterNode("filer", pb.ServerAddress("111:4"), "23.45") + c.AddClusterNode("", "filer", pb.ServerAddress("111:3"), "23.45") + c.AddClusterNode("", "filer", pb.ServerAddress("111:4"), "23.45") assert.Equal(t, []pb.ServerAddress{ pb.ServerAddress("111:1"), pb.ServerAddress("111:2"), pb.ServerAddress("111:3"), - }, c.filerLeaders.GetLeaders()) + }, c.getFilers("", false).leaders.GetLeaders()) - c.AddClusterNode("filer", pb.ServerAddress("111:5"), "23.45") - c.AddClusterNode("filer", pb.ServerAddress("111:6"), "23.45") - c.RemoveClusterNode("filer", pb.ServerAddress("111:4")) + c.AddClusterNode("", "filer", pb.ServerAddress("111:5"), "23.45") + c.AddClusterNode("", "filer", pb.ServerAddress("111:6"), "23.45") + c.RemoveClusterNode("", "filer", pb.ServerAddress("111:4")) assert.Equal(t, []pb.ServerAddress{ pb.ServerAddress("111:1"), pb.ServerAddress("111:2"), pb.ServerAddress("111:3"), - }, c.filerLeaders.GetLeaders()) + }, c.getFilers("", false).leaders.GetLeaders()) // remove oldest - c.RemoveClusterNode("filer", pb.ServerAddress("111:1")) + c.RemoveClusterNode("", "filer", pb.ServerAddress("111:1")) assert.Equal(t, []pb.ServerAddress{ pb.ServerAddress("111:6"), pb.ServerAddress("111:2"), pb.ServerAddress("111:3"), - }, c.filerLeaders.GetLeaders()) + }, c.getFilers("", false).leaders.GetLeaders()) // remove oldest - c.RemoveClusterNode("filer", pb.ServerAddress("111:1")) + c.RemoveClusterNode("", "filer", pb.ServerAddress("111:1")) } |