aboutsummaryrefslogtreecommitdiff
path: root/weed/command/master.go
diff options
context:
space:
mode:
authorhilimd <68371223+hilimd@users.noreply.github.com>2020-10-18 09:44:04 +0800
committerGitHub <noreply@github.com>2020-10-18 09:44:04 +0800
commit62af2d961d62f01510d0ad25569f4b82e4809996 (patch)
tree109e26db37bb2365973c70983833da7305b69f34 /weed/command/master.go
parent5c2e409ffe0e9517e597ebf89e9eb3ba55883f28 (diff)
parentc0ab458671f2859990caab70b59041513d90edac (diff)
downloadseaweedfs-62af2d961d62f01510d0ad25569f4b82e4809996.tar.xz
seaweedfs-62af2d961d62f01510d0ad25569f4b82e4809996.zip
Merge pull request #28 from chrislusf/master
sync
Diffstat (limited to 'weed/command/master.go')
-rw-r--r--weed/command/master.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/command/master.go b/weed/command/master.go
index bf5f83875..74c170395 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -145,7 +145,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) {
go func() {
time.Sleep(1500 * time.Millisecond)
if ms.Topo.RaftServer.Leader() == "" && ms.Topo.RaftServer.IsLogEmpty() && isTheFirstOne(myMasterAddress, peers) {
- if ms.MasterClient.FindLeader(myMasterAddress) == "" {
+ if ms.MasterClient.FindLeaderFromOtherPeers(myMasterAddress) == "" {
raftServer.DoJoinCommand()
}
}