|
@ -50,7 +50,6 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ |
|
|
} |
|
|
} |
|
|
ms.clientChansLock.RUnlock() |
|
|
ms.clientChansLock.RUnlock() |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
}() |
|
|
}() |
|
|
|
|
|
|
|
@ -72,14 +71,14 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ |
|
|
dc := ms.Topo.GetOrCreateDataCenter(dcName) |
|
|
dc := ms.Topo.GetOrCreateDataCenter(dcName) |
|
|
rack := dc.GetOrCreateRack(rackName) |
|
|
rack := dc.GetOrCreateRack(rackName) |
|
|
dn = rack.GetOrCreateDataNode(heartbeat.Ip, int(heartbeat.Port), heartbeat.PublicUrl, heartbeat.MaxVolumeCounts) |
|
|
dn = rack.GetOrCreateDataNode(heartbeat.Ip, int(heartbeat.Port), heartbeat.PublicUrl, heartbeat.MaxVolumeCounts) |
|
|
dn.Counter++ |
|
|
|
|
|
glog.V(0).Infof("added volume server %v:%d", heartbeat.GetIp(), heartbeat.GetPort()) |
|
|
|
|
|
|
|
|
glog.V(0).Infof("added %d volume server %v:%d", dn.Counter, heartbeat.GetIp(), heartbeat.GetPort()) |
|
|
if err := stream.Send(&master_pb.HeartbeatResponse{ |
|
|
if err := stream.Send(&master_pb.HeartbeatResponse{ |
|
|
VolumeSizeLimit: uint64(ms.option.VolumeSizeLimitMB) * 1024 * 1024, |
|
|
VolumeSizeLimit: uint64(ms.option.VolumeSizeLimitMB) * 1024 * 1024, |
|
|
}); err != nil { |
|
|
}); err != nil { |
|
|
glog.Warningf("SendHeartbeat.Send volume size to %s:%d %v", dn.Ip, dn.Port, err) |
|
|
glog.Warningf("SendHeartbeat.Send volume size to %s:%d %v", dn.Ip, dn.Port, err) |
|
|
return err |
|
|
return err |
|
|
} |
|
|
} |
|
|
|
|
|
dn.Counter++ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
dn.AdjustMaxVolumeCounts(heartbeat.MaxVolumeCounts) |
|
|
dn.AdjustMaxVolumeCounts(heartbeat.MaxVolumeCounts) |
|
|