diff options
| author | chrislu <chris.lu@gmail.com> | 2023-01-10 00:52:50 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-01-10 00:52:50 -0800 |
| commit | 47fa5ef979976efc6aa4b7e9d488d4e1244cd445 (patch) | |
| tree | 25a0a4979fa7dfccc69fe90270c58ac86a399907 /weed | |
| parent | 9e0d5261633617bfea20d8f7df01598bf91bc0b2 (diff) | |
| parent | 44b0176e9e0f43453cdff2701c3293dad27da943 (diff) | |
| download | seaweedfs-47fa5ef979976efc6aa4b7e9d488d4e1244cd445.tar.xz seaweedfs-47fa5ef979976efc6aa4b7e9d488d4e1244cd445.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index 921ec0677..e2cae079e 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -158,8 +158,8 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti return "", err } - volumeTickChan := time.Tick(sleepInterval) - ecShardTickChan := time.Tick(17 * sleepInterval) + volumeTickChan := time.NewTicker(sleepInterval) + ecShardTickChan := time.NewTicker(17 * sleepInterval) dataCenter := vs.store.GetDataCenter() rack := vs.store.GetRack() ip := vs.store.Ip @@ -228,14 +228,14 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti glog.V(0).Infof("Volume Server Failed to update to master %s: %v", masterAddress, err) return "", err } - case <-volumeTickChan: + case <-volumeTickChan.C: glog.V(4).Infof("volume server %s:%d heartbeat", vs.store.Ip, vs.store.Port) vs.store.MaybeAdjustVolumeMax() if err = stream.Send(vs.store.CollectHeartbeat()); err != nil { glog.V(0).Infof("Volume Server Failed to talk with master %s: %v", masterAddress, err) return "", err } - case <-ecShardTickChan: + case <-ecShardTickChan.C: glog.V(4).Infof("volume server %s:%d ec heartbeat", vs.store.Ip, vs.store.Port) if err = stream.Send(vs.store.CollectErasureCodingHeartbeat()); err != nil { glog.V(0).Infof("Volume Server Failed to talk with master %s: %v", masterAddress, err) |