diff options
| author | chrislu <chris.lu@gmail.com> | 2024-06-14 11:42:05 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-06-14 11:42:05 -0700 |
| commit | 32dbb6a2ceb86a44d7879bdb506ab759d59f056b (patch) | |
| tree | 94c1d9cd5c086b437c4df2847b1a42b6432b535b /weed/server/master_server.go | |
| parent | 70b31e3a28b8169289bb9c55052355a3daacfd12 (diff) | |
| parent | 8aae82dd71735df1cd915a47a9b9d453d393adf6 (diff) | |
| download | seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.tar.xz seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.zip | |
Merge branch 'master' into mq
Diffstat (limited to 'weed/server/master_server.go')
| -rw-r--r-- | weed/server/master_server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 580cdfed2..3499a2e13 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -292,12 +292,12 @@ func (ms *MasterServer) startAdminScripts() { reg, _ := regexp.Compile(`'.*?'|".*?"|\S+`) - go commandEnv.MasterClient.KeepConnectedToMaster() + go commandEnv.MasterClient.KeepConnectedToMaster(context.Background()) go func() { for { time.Sleep(time.Duration(sleepMinutes) * time.Minute) - if ms.Topo.IsLeader() && ms.MasterClient.GetMaster() != "" { + if ms.Topo.IsLeader() && ms.MasterClient.GetMaster(context.Background()) != "" { shellOptions.FilerAddress = ms.GetOneFiler(cluster.FilerGroupName(*shellOptions.FilerGroup)) if shellOptions.FilerAddress == "" { continue |