diff options
| author | chrislu <chris.lu@gmail.com> | 2024-05-24 17:15:27 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-05-24 17:15:27 -0700 |
| commit | ba778539d9aaedb14f89276f50c2be55a2ab6dfa (patch) | |
| tree | 19e4cdb3abb2cb4789db061ab1a66af9bb8d8ff9 /weed | |
| parent | 37d1ee562d73dfa8f130fc8b9c0bf88fd3337c16 (diff) | |
| parent | 364bb6c7b477d3794cbbdf9ddc6a80d5347ab3cc (diff) | |
| download | seaweedfs-ba778539d9aaedb14f89276f50c2be55a2ab6dfa.tar.xz seaweedfs-ba778539d9aaedb14f89276f50c2be55a2ab6dfa.zip | |
Merge branch 'master' into mq
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/server/master_grpc_server.go | 1 | ||||
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 616b28e67..8feb909ad 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -297,6 +297,7 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ }() ticker := time.NewTicker(5 * time.Second) + defer ticker.Stop() for { select { case message := <-messageChan: diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index e2cae079e..d2aa61a17 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -159,7 +159,9 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti } volumeTickChan := time.NewTicker(sleepInterval) + defer volumeTickChan.Stop() ecShardTickChan := time.NewTicker(17 * sleepInterval) + defer ecShardTickChan.Stop() dataCenter := vs.store.GetDataCenter() rack := vs.store.GetRack() ip := vs.store.Ip |