diff options
| author | vadimartynov <166398828+vadimartynov@users.noreply.github.com> | 2024-06-14 21:40:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 11:40:34 -0700 |
| commit | 8aae82dd71735df1cd915a47a9b9d453d393adf6 (patch) | |
| tree | c9bb9a876485fddfd17c84c857e2cb97a46dfc5d /weed/shell/shell_liner.go | |
| parent | 2a169dde9a4dab7d3b66f1be47b29d42b730f3a6 (diff) | |
| download | seaweedfs-8aae82dd71735df1cd915a47a9b9d453d393adf6.tar.xz seaweedfs-8aae82dd71735df1cd915a47a9b9d453d393adf6.zip | |
Added context for the MasterClient's methods to avoid endless loops (#5628)
* Added context for the MasterClient's methods to avoid endless loops
* Returned WithClient function. Added WithClientCustomGetMaster function
* Hid unused ctx arguments
* Using a common context for the KeepConnectedToMaster and WaitUntilConnected functions
* Changed the context termination check in the tryConnectToMaster function
* Added a child context to the tryConnectToMaster function
* Added a common context for KeepConnectedToMaster and WaitUntilConnected functions in benchmark
Diffstat (limited to 'weed/shell/shell_liner.go')
| -rw-r--r-- | weed/shell/shell_liner.go | 5 |
1 files changed, 3 insertions, 2 deletions
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 |