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/shell | |
| parent | 70b31e3a28b8169289bb9c55052355a3daacfd12 (diff) | |
| parent | 8aae82dd71735df1cd915a47a9b9d453d393adf6 (diff) | |
| download | seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.tar.xz seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.zip | |
Merge branch 'master' into mq
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_cluster_check.go | 2 | ||||
| -rw-r--r-- | weed/shell/shell_liner.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/weed/shell/command_cluster_check.go b/weed/shell/command_cluster_check.go index 03acca5b2..5c9866d29 100644 --- a/weed/shell/command_cluster_check.go +++ b/weed/shell/command_cluster_check.go @@ -103,7 +103,7 @@ func (c *commandClusterCheck) Do(args []string, commandEnv *CommandEnv, writer i // collect all masters var masters []pb.ServerAddress - masters = append(masters, commandEnv.MasterClient.GetMasters()...) + masters = append(masters, commandEnv.MasterClient.GetMasters(context.Background())...) // check from master to volume servers for _, master := range masters { diff --git a/weed/shell/shell_liner.go b/weed/shell/shell_liner.go index 20add302a..407dce006 100644 --- a/weed/shell/shell_liner.go +++ b/weed/shell/shell_liner.go @@ -46,8 +46,9 @@ func RunShell(options ShellOptions) { commandEnv := NewCommandEnv(&options) - go commandEnv.MasterClient.KeepConnectedToMaster() - commandEnv.MasterClient.WaitUntilConnected() + ctx := context.Background() + go commandEnv.MasterClient.KeepConnectedToMaster(ctx) + commandEnv.MasterClient.WaitUntilConnected(ctx) if commandEnv.option.FilerAddress == "" { var filers []pb.ServerAddress |