diff options
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 12 | ||||
| -rw-r--r-- | weed/server/volume_server.go | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index c62a4a388..468429db8 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -168,10 +168,14 @@ func (vs *VolumeServer) doHeartbeat(masterNode, masterGrpcAddress string, grpcDi return "", err } case <-volumeTickChan: - glog.V(5).Infof("volume server %s:%d heartbeat", vs.store.Ip, vs.store.Port) - if err = stream.Send(vs.store.CollectHeartbeat()); err != nil { - glog.V(0).Infof("Volume Server Failed to talk with master %s: %v", masterNode, err) - return "", err + if vs.SendHeartbeat { + glog.V(5).Infof("volume server %s:%d heartbeat", vs.store.Ip, vs.store.Port) + if err = stream.Send(vs.store.CollectHeartbeat()); err != nil { + glog.V(0).Infof("Volume Server Failed to talk with master %s: %v", masterNode, err) + return "", err + } + } else { + glog.V(5).Infof("volume server %s:%d skip send heartbeat", vs.store.Ip, vs.store.Port) } case <-ecShardTickChan: glog.V(5).Infof("volume server %s:%d ec heartbeat", vs.store.Ip, vs.store.Port) diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index fc6fa5cee..6612e9045 100644 --- a/weed/server/volume_server.go +++ b/weed/server/volume_server.go @@ -31,6 +31,7 @@ type VolumeServer struct { MetricsAddress string MetricsIntervalSec int fileSizeLimitBytes int64 + SendHeartbeat bool } func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, @@ -66,6 +67,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, grpcDialOption: security.LoadClientTLS(util.GetViper(), "grpc.volume"), compactionBytePerSecond: int64(compactionMBPerSecond) * 1024 * 1024, fileSizeLimitBytes: int64(fileSizeLimitMB) * 1024 * 1024, + SendHeartbeat: true, } vs.SeedMasterNodes = masterNodes vs.store = storage.NewStore(vs.grpcDialOption, port, ip, publicUrl, folders, maxCounts, minFreeSpacePercents, vs.needleMapKind) |