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/server/filer_server.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/server/filer_server.go')
| -rw-r--r-- | weed/server/filer_server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 795cd3ccc..0b7254c0d 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -160,7 +160,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) fs.checkWithMaster() go stats.LoopPushingMetric("filer", string(fs.option.Host), fs.metricsAddress, fs.metricsIntervalSec) - go fs.filer.KeepMasterClientConnected() + go fs.filer.KeepMasterClientConnected(context.Background()) if !util.LoadConfiguration("filer", false) { v.SetDefault("leveldb2.enabled", true) @@ -196,7 +196,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) readonlyMux.HandleFunc("/", fs.readonlyFilerHandler) } - existingNodes := fs.filer.ListExistingPeerUpdates() + existingNodes := fs.filer.ListExistingPeerUpdates(context.Background()) startFromTime := time.Now().Add(-filer.LogFlushInterval) if option.JoinExistingFiler { startFromTime = time.Time{} |