diff options
Diffstat (limited to 'weed/server/volume_grpc_client_to_master.go')
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index a7b75d6a5..078b78eb2 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -119,30 +119,16 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti return } if len(in.DuplicatedUuids) > 0 { - var duplicatedDir []string - - foundDuplicate := false - duplicateSet := make(map[string]struct{}) + var duplicateDir []string for _, loc := range vs.store.Locations { - directoryUuid := loc.DirectoryUuid - if _, exists := duplicateSet[directoryUuid]; !exists { - duplicateSet[directoryUuid] = struct{}{} - } else { - foundDuplicate = true - } - for _, uuid := range in.DuplicatedUuids { - if uuid == directoryUuid { - duplicatedDir = append(duplicatedDir, loc.Directory) + if uuid == loc.DirectoryUuid { + duplicateDir = append(duplicateDir, loc.Directory) } } } - if foundDuplicate { - glog.Errorf("Shut down Volume Server due to duplicated volume directories: %v", duplicatedDir) - os.Exit(1) - } else { - glog.Warningf("Receive response of duplicated volume directories: %v, ignored(the check found no duplicates)", duplicatedDir) - } + glog.Errorf("Shut down Volume Server due to duplicate volume directories: %v", duplicateDir) + os.Exit(1) } if in.GetVolumeSizeLimit() != 0 && vs.store.GetVolumeSizeLimit() != in.GetVolumeSizeLimit() { vs.store.SetVolumeSizeLimit(in.GetVolumeSizeLimit()) |