diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-06-25 00:01:53 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-06-25 00:01:53 -0700 |
| commit | 0d83c1b91eba8edb64b247984a2a02d3e774c9ce (patch) | |
| tree | d5840a400aae31943a24e2dac180e584162b2d0b /weed/server/master_grpc_server.go | |
| parent | 018a9a20be26b704abb27b19a22a4377624a9d5c (diff) | |
| download | seaweedfs-0d83c1b91eba8edb64b247984a2a02d3e774c9ce.tar.xz seaweedfs-0d83c1b91eba8edb64b247984a2a02d3e774c9ce.zip | |
refactoring
Diffstat (limited to 'weed/server/master_grpc_server.go')
| -rw-r--r-- | weed/server/master_grpc_server.go | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 6c293fe95..f24cea619 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -6,7 +6,6 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" - "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/topology" "google.golang.org/grpc/peer" ) @@ -50,21 +49,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ } } - var volumeInfos []storage.VolumeInfo - 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) - } + t.SyncDataNodeRegistration(heartbeat.Volumes, dn) } else { return err |
