Merge pull request #3159 from shichanglin5/_duplicateUUID

perf: Optimized volume handling duplicateUUID logic to avoid quitting…

weed/server/volume_grpc_client_to_master.go

@@ -119,16 +119,30 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti
 				return
 			}
 			if len(in.DuplicatedUuids) > 0 {
-				var duplictedDir []string
+				var duplicatedDir []string
+
+				foundDuplicate := false
+				duplicateSet := make(map[string]struct{})
 				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 == loc.DirectoryUuid {
-							duplictedDir = append(duplictedDir, loc.Directory)
+						if uuid == directoryUuid {
+							duplicatedDir = append(duplicatedDir, loc.Directory)
 						}
 					}
 				}
-				glog.Errorf("Shut down Volume Server due to duplicated volume directories: %v", duplictedDir)
-				os.Exit(1)
+				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)
+				}
 			}
 			if in.GetVolumeSizeLimit() != 0 && vs.store.GetVolumeSizeLimit() != in.GetVolumeSizeLimit() {
 				vs.store.SetVolumeSizeLimit(in.GetVolumeSizeLimit())

weed/storage/volume.go

@@ -293,7 +293,6 @@ func (v *Volume) collectStatus() (maxFileKey types.NeedleId, datFileSize int64,
 	fileCount = uint64(v.nm.FileCount())
 	deletedCount = uint64(v.nm.DeletedCount())
 	deletedSize = v.nm.DeletedSize()
-	fileCount = uint64(v.nm.FileCount())
 
 	return
 }