mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-07-04 08:06:53 +02:00
Code Issues Projects Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Chris Lu 2018-06-25 00:01:53 -07:00
parent 018a9a20be
commit 0d83c1b91e
3 changed files with 22 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
weed/server/master_grpc_server.go
View file

@ -6,7 +6,6 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/topology" "github.com/chrislusf/seaweedfs/weed/topology"
"google.golang.org/grpc/peer" "google.golang.org/grpc/peer"
) )
@ -50,21 +49,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
} }
} }
var volumeInfos []storage.VolumeInfo t.SyncDataNodeRegistration(heartbeat.Volumes, dn)
for _, v := range heartbeat.Volumes {
if vi, err := storage.NewVolumeInfo(v); err == nil {
volumeInfos = append(volumeInfos, vi)
} else {
glog.V(0).Infof("Fail to convert joined volume information: %v", err)
}
}
deletedVolumes := dn.UpdateVolumes(volumeInfos)
for _, v := range volumeInfos {
t.RegisterVolumeLayout(v, dn)
}
for _, v := range deletedVolumes {
t.UnRegisterVolumeLayout(v, dn)
}
} else { } else {
return err return err

19
weed/topology/topology.go
View file

@ -9,6 +9,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/sequence" "github.com/chrislusf/seaweedfs/weed/sequence"
"github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
) )
type Topology struct { type Topology struct {
@ -145,3 +146,21 @@ func (t *Topology) GetOrCreateDataCenter(dcName string) *DataCenter {
t.LinkChildNode(dc) t.LinkChildNode(dc)
return dc return dc
} }
func (t *Topology) SyncDataNodeRegistration(volumes []*master_pb.VolumeInformationMessage, dn *DataNode) {
var volumeInfos []storage.VolumeInfo
for _, v := range volumes {
if vi, err := storage.NewVolumeInfo(v); err == nil {
volumeInfos = append(volumeInfos, vi)
} else {
glog.V(0).Infof("Fail to convert joined volume information: %v", err)
}
}
deletedVolumes := dn.UpdateVolumes(volumeInfos)
for _, v := range volumeInfos {
t.RegisterVolumeLayout(v, dn)
}
for _, v := range deletedVolumes {
t.UnRegisterVolumeLayout(v, dn)
}
}

30
weed/topology/topology_test.go
View file

@ -4,7 +4,6 @@ import (
"testing" "testing"
"github.com/chrislusf/seaweedfs/weed/sequence" "github.com/chrislusf/seaweedfs/weed/sequence"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage"
) )
func TestRemoveDataCenter(t *testing.T) { func TestRemoveDataCenter(t *testing.T) {
@ -44,20 +43,8 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) {
} }
volumeMessages = append(volumeMessages, volumeMessage) volumeMessages = append(volumeMessages, volumeMessage)
} }
var volumeInfos []storage.VolumeInfo
for _, v := range volumeMessages {
if vi, err := storage.NewVolumeInfo(v); err == nil {
volumeInfos = append(volumeInfos, vi)
}
}
deletedVolumes := dn.UpdateVolumes(volumeInfos) topo.SyncDataNodeRegistration(volumeMessages, dn)
for _, v := range volumeInfos {
topo.RegisterVolumeLayout(v, dn)
}
for _, v := range deletedVolumes {
topo.UnRegisterVolumeLayout(v, dn)
}
assert(t, "activeVolumeCount1", topo.activeVolumeCount, volumeCount) assert(t, "activeVolumeCount1", topo.activeVolumeCount, volumeCount)
assert(t, "volumeCount", topo.volumeCount, volumeCount) assert(t, "volumeCount", topo.volumeCount, volumeCount)
@ -81,20 +68,7 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) {
} }
volumeMessages = append(volumeMessages, volumeMessage) volumeMessages = append(volumeMessages, volumeMessage)
} }
var volumeInfos []storage.VolumeInfo topo.SyncDataNodeRegistration(volumeMessages, dn)
for _, v := range volumeMessages {
if vi, err := storage.NewVolumeInfo(v); err == nil {
volumeInfos = append(volumeInfos, vi)
}
}
deletedVolumes := dn.UpdateVolumes(volumeInfos)
for _, v := range volumeInfos {
topo.RegisterVolumeLayout(v, dn)
}
for _, v := range deletedVolumes {
topo.UnRegisterVolumeLayout(v, dn)
}
assert(t, "activeVolumeCount1", topo.activeVolumeCount, volumeCount) assert(t, "activeVolumeCount1", topo.activeVolumeCount, volumeCount)
assert(t, "volumeCount", topo.volumeCount, volumeCount) assert(t, "volumeCount", topo.volumeCount, volumeCount)