aboutsummaryrefslogtreecommitdiff
path: root/weed/shell
diff options
context:
space:
mode:
Diffstat (limited to 'weed/shell')
-rw-r--r--weed/shell/command_cluster_check.go2
-rw-r--r--weed/shell/shell_liner.go5
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