aboutsummaryrefslogtreecommitdiff
path: root/weed/server/master_server.go
diff options
context:
space:
mode:
authorKonstantin Lebedev <9497591+kmlebedev@users.noreply.github.com>2022-08-12 01:03:26 +0300
committerGitHub <noreply@github.com>2022-08-11 15:03:26 -0700
commit4d4cd0948d45bc537cbc2eaf3babca0559d27b25 (patch)
tree4143f8d76c70d66ecb1ce79117202acaa1a21298 /weed/server/master_server.go
parent53b601616cb5c42c49cf5d8f82a4142a1a7f41c3 (diff)
downloadseaweedfs-4d4cd0948d45bc537cbc2eaf3babca0559d27b25.tar.xz
seaweedfs-4d4cd0948d45bc537cbc2eaf3babca0559d27b25.zip
avoid infinite loop WaitUntilConnected() (#3431)
https://github.com/seaweedfs/seaweedfs/issues/3421
Diffstat (limited to 'weed/server/master_server.go')
-rw-r--r--weed/server/master_server.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go
index 57103f166..fbc27e610 100644
--- a/weed/server/master_server.go
+++ b/weed/server/master_server.go
@@ -276,11 +276,9 @@ func (ms *MasterServer) startAdminScripts() {
go commandEnv.MasterClient.KeepConnectedToMaster()
go func() {
- commandEnv.MasterClient.WaitUntilConnected()
-
for {
time.Sleep(time.Duration(sleepMinutes) * time.Minute)
- if ms.Topo.IsLeader() {
+ if ms.Topo.IsLeader() && ms.MasterClient.GetMaster() != "" {
shellOptions.FilerAddress = ms.GetOneFiler(cluster.FilerGroupName(*shellOptions.FilerGroup))
if shellOptions.FilerAddress == "" {
continue