mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
initial
This commit is contained in:
parent
73f934d5de
commit
dc26012a3b
|
@ -783,7 +783,8 @@ type VolumeLocation struct {
|
||||||
PublicUrl string `protobuf:"bytes,2,opt,name=public_url,json=publicUrl,proto3" json:"public_url,omitempty"`
|
PublicUrl string `protobuf:"bytes,2,opt,name=public_url,json=publicUrl,proto3" json:"public_url,omitempty"`
|
||||||
NewVids []uint32 `protobuf:"varint,3,rep,packed,name=new_vids,json=newVids,proto3" json:"new_vids,omitempty"`
|
NewVids []uint32 `protobuf:"varint,3,rep,packed,name=new_vids,json=newVids,proto3" json:"new_vids,omitempty"`
|
||||||
DeletedVids []uint32 `protobuf:"varint,4,rep,packed,name=deleted_vids,json=deletedVids,proto3" json:"deleted_vids,omitempty"`
|
DeletedVids []uint32 `protobuf:"varint,4,rep,packed,name=deleted_vids,json=deletedVids,proto3" json:"deleted_vids,omitempty"`
|
||||||
Leader string `protobuf:"bytes,5,opt,name=leader,proto3" json:"leader,omitempty"` // optional when leader is not itself
|
Leader string `protobuf:"bytes,5,opt,name=leader,proto3" json:"leader,omitempty"` // optional when leader is not itself
|
||||||
|
DataCenter string `protobuf:"bytes,6,opt,name=data_center,proto3" json:"dataCenter,omitempty"` // optional when DataCenter is in use
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *VolumeLocation) Reset() {
|
func (x *VolumeLocation) Reset() {
|
||||||
|
|
|
@ -29,8 +29,9 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
|
||||||
glog.V(0).Infof("unregister disconnected volume server %s:%d", dn.Ip, dn.Port)
|
glog.V(0).Infof("unregister disconnected volume server %s:%d", dn.Ip, dn.Port)
|
||||||
|
|
||||||
message := &master_pb.VolumeLocation{
|
message := &master_pb.VolumeLocation{
|
||||||
Url: dn.Url(),
|
Url: dn.Url(),
|
||||||
PublicUrl: dn.PublicUrl,
|
PublicUrl: dn.PublicUrl,
|
||||||
|
DataCenter: dn.GetDataCenter().String(),
|
||||||
}
|
}
|
||||||
for _, v := range dn.GetVolumes() {
|
for _, v := range dn.GetVolumes() {
|
||||||
message.DeletedVids = append(message.DeletedVids, uint32(v.Id))
|
message.DeletedVids = append(message.DeletedVids, uint32(v.Id))
|
||||||
|
@ -86,8 +87,9 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
|
||||||
|
|
||||||
glog.V(4).Infof("master received heartbeat %s", heartbeat.String())
|
glog.V(4).Infof("master received heartbeat %s", heartbeat.String())
|
||||||
message := &master_pb.VolumeLocation{
|
message := &master_pb.VolumeLocation{
|
||||||
Url: dn.Url(),
|
Url: dn.Url(),
|
||||||
PublicUrl: dn.PublicUrl,
|
PublicUrl: dn.PublicUrl,
|
||||||
|
DataCenter: dn.GetDataCenter().String(),
|
||||||
}
|
}
|
||||||
if len(heartbeat.NewVolumes) > 0 || len(heartbeat.DeletedVolumes) > 0 {
|
if len(heartbeat.NewVolumes) > 0 || len(heartbeat.DeletedVolumes) > 0 {
|
||||||
// process delta volume ids if exists for fast volume id updates
|
// process delta volume ids if exists for fast volume id updates
|
||||||
|
|
|
@ -62,8 +62,9 @@ func (t *Topology) ToVolumeLocations() (volumeLocations []*master_pb.VolumeLocat
|
||||||
for _, d := range rack.Children() {
|
for _, d := range rack.Children() {
|
||||||
dn := d.(*DataNode)
|
dn := d.(*DataNode)
|
||||||
volumeLocation := &master_pb.VolumeLocation{
|
volumeLocation := &master_pb.VolumeLocation{
|
||||||
Url: dn.Url(),
|
Url: dn.Url(),
|
||||||
PublicUrl: dn.PublicUrl,
|
PublicUrl: dn.PublicUrl,
|
||||||
|
DataCenter: dn.GetDataCenter().String(),
|
||||||
}
|
}
|
||||||
for _, v := range dn.GetVolumes() {
|
for _, v := range dn.GetVolumes() {
|
||||||
volumeLocation.NewVids = append(volumeLocation.NewVids, uint32(v.Id))
|
volumeLocation.NewVids = append(volumeLocation.NewVids, uint32(v.Id))
|
||||||
|
|
|
@ -130,8 +130,9 @@ func (mc *MasterClient) tryConnectToMaster(master string) (nextHintedLeader stri
|
||||||
|
|
||||||
// process new volume location
|
// process new volume location
|
||||||
loc := Location{
|
loc := Location{
|
||||||
Url: volumeLocation.Url,
|
Url: volumeLocation.Url,
|
||||||
PublicUrl: volumeLocation.PublicUrl,
|
PublicUrl: volumeLocation.PublicUrl,
|
||||||
|
DataCenter: volumeLocation.DataCenter,
|
||||||
}
|
}
|
||||||
for _, newVid := range volumeLocation.NewVids {
|
for _, newVid := range volumeLocation.NewVids {
|
||||||
glog.V(1).Infof("%s: %s masterClient adds volume %d", mc.clientType, loc.Url, newVid)
|
glog.V(1).Infof("%s: %s masterClient adds volume %d", mc.clientType, loc.Url, newVid)
|
||||||
|
|
|
@ -16,8 +16,9 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
type Location struct {
|
type Location struct {
|
||||||
Url string `json:"url,omitempty"`
|
Url string `json:"url,omitempty"`
|
||||||
PublicUrl string `json:"publicUrl,omitempty"`
|
PublicUrl string `json:"publicUrl,omitempty"`
|
||||||
|
DataCenter string `json:"dataCenter,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type vidMap struct {
|
type vidMap struct {
|
||||||
|
|
Loading…
Reference in a new issue