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/filer/filer.go | |
| parent | 70b31e3a28b8169289bb9c55052355a3daacfd12 (diff) | |
| parent | 8aae82dd71735df1cd915a47a9b9d453d393adf6 (diff) | |
| download | seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.tar.xz seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.zip | |
Merge branch 'master' into mq
Diffstat (limited to 'weed/filer/filer.go')
| -rw-r--r-- | weed/filer/filer.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/weed/filer/filer.go b/weed/filer/filer.go index 9be8d5259..016bfc8fa 100644 --- a/weed/filer/filer.go +++ b/weed/filer/filer.go @@ -143,8 +143,8 @@ func (f *Filer) AggregateFromPeers(self pb.ServerAddress, existingNodes []*maste } -func (f *Filer) ListExistingPeerUpdates() (existingNodes []*master_pb.ClusterNodeUpdate) { - return cluster.ListExistingPeerUpdates(f.GetMaster(), f.GrpcDialOption, f.MasterClient.FilerGroup, cluster.FilerType) +func (f *Filer) ListExistingPeerUpdates(ctx context.Context) (existingNodes []*master_pb.ClusterNodeUpdate) { + return cluster.ListExistingPeerUpdates(f.GetMaster(ctx), f.GrpcDialOption, f.MasterClient.FilerGroup, cluster.FilerType) } func (f *Filer) SetStore(store FilerStore) (isFresh bool) { @@ -177,12 +177,12 @@ func (f *Filer) GetStore() (store FilerStore) { return f.Store } -func (fs *Filer) GetMaster() pb.ServerAddress { - return fs.MasterClient.GetMaster() +func (fs *Filer) GetMaster(ctx context.Context) pb.ServerAddress { + return fs.MasterClient.GetMaster(ctx) } -func (fs *Filer) KeepMasterClientConnected() { - fs.MasterClient.KeepConnectedToMaster() +func (fs *Filer) KeepMasterClientConnected(ctx context.Context) { + fs.MasterClient.KeepConnectedToMaster(ctx) } func (f *Filer) BeginTransaction(ctx context.Context) (context.Context, error) { |