shell: fix moving volume, volume server evacuate

fix #1534
seaweedfs · Mar 15, 2021 · a4cfffc · a4cfffc
1 parent ca10056
commit a4cfffc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/weed/shell/command_volume_balance.go b/weed/shell/command_volume_balance.go
@@ -393,9 +393,8 @@ func adjustAfterMove(v *master_pb.VolumeInformationMessage, volumeReplicas map[u
 		if replica.location.dataNode.Id == fullNode.info.Id &&
 			replica.location.rack == fullNode.rack &&
 			replica.location.dc == fullNode.dc {
-			replica.location.dc = emptyNode.dc
-			replica.location.rack = emptyNode.rack
-			replica.location.dataNode = emptyNode.info
+			loc := newLocation(emptyNode.dc, emptyNode.rack, emptyNode.info)
+			replica.location = &loc
 			return
 		}
 	}

diff --git a/weed/shell/command_volume_server_evacuate_test.go b/weed/shell/command_volume_server_evacuate_test.go
@@ -0,0 +1,17 @@
+package shell
+
+import (
+	"os"
+	"testing"
+)
+
+func TestVolumeServerEvacuate(t *testing.T) {
+	topologyInfo := parseOutput(topoData)
+
+	volumeServer := "192.168.1.4:8080"
+
+	if err := evacuateNormalVolumes(nil, topologyInfo, volumeServer, true, false, os.Stdout); err != nil {
+		t.Errorf("evacuate: %v", err)
+	}
+
+}