possible fix for volume balance

address #1534
seaweedfs · Mar 15, 2021 · 29e62ab · 29e62ab
1 parent 35d939a
commit 29e62ab
Show file tree

Hide file tree

Showing 3 changed files with 905 additions and 1 deletion.
diff --git a/weed/shell/command_volume_balance.go b/weed/shell/command_volume_balance.go
@@ -201,7 +201,7 @@ type CapacityFunc func(*master_pb.DataNodeInfo) int
 
 func capacityByMaxVolumeCount(diskType types.DiskType) CapacityFunc {
 	return func(info *master_pb.DataNodeInfo) int {
-		diskInfo, found := info.DiskInfos[string(diskType)]
+		diskInfo, found := info.DiskInfos[diskType.ReadableString()]
 		if !found {
 			return 0
 		}

diff --git a/weed/shell/command_volume_balance_test.go b/weed/shell/command_volume_balance_test.go
@@ -169,3 +169,15 @@ func TestIsGoodMove(t *testing.T) {
 	}
 
 }
+
+func TestBalance(t *testing.T) {
+	topologyInfo := parseOutput(topoData)
+	volumeServers := collectVolumeServersByDc(topologyInfo, "")
+	volumeReplicas, _ := collectVolumeReplicaLocations(topologyInfo)
+	diskTypes := collectVolumeDiskTypes(topologyInfo)
+
+	if err := balanceVolumeServers(nil, diskTypes, volumeReplicas, volumeServers, 30*1024*1024*1024, "ALL_COLLECTIONS", false); err != nil {
+		t.Errorf("balance: %v", err)
+	}
+
+}