Merge pull request #12148 from roosterfish/fix_mv_instance_placement

Instance: Fix placement when moving within same cluster group

lxd/instance_post.go

@@ -260,8 +260,18 @@ func instancePost(d *Daemon, r *http.Request) response.Response {
 
 		// If no member was selected yet, pick the member with the least number of instances.
 		if targetMemberInfo == nil {
+			var filteredCandidateMembers []db.NodeInfo
+
+			// The instance might already be placed on the node with least number of instances.
+			// Therefore remove it from the list of possible candidates if existent.
+			for _, candidateMember := range candidateMembers {
+				if candidateMember.Name != inst.Location() {
+					filteredCandidateMembers = append(filteredCandidateMembers, candidateMember)
+				}
+			}
+
 			err := s.DB.Cluster.Transaction(r.Context(), func(ctx context.Context, tx *db.ClusterTx) error {
-				targetMemberInfo, err = tx.GetNodeWithLeastInstances(ctx, candidateMembers)
+				targetMemberInfo, err = tx.GetNodeWithLeastInstances(ctx, filteredCandidateMembers)
 				return err
 			})
 			if err != nil {

test/suites/clustering_move.sh

@@ -52,8 +52,12 @@ test_clustering_move() {
   LXD_DIR="${LXD_ONE_DIR}" lxc info c1 | grep -q "Location: node1"
 
   # c1 can be moved within the same cluster group if it has multiple members
+  current_location="$(LXD_DIR="${LXD_ONE_DIR}" lxc query /1.0/instances/c1 | jq -r '.location')"
   LXD_DIR="${LXD_ONE_DIR}" lxc move c1 --target=@default
+  LXD_DIR="${LXD_ONE_DIR}" lxc query /1.0/instances/c1 | jq -re ".location != \"$current_location\""
+  current_location="$(LXD_DIR="${LXD_ONE_DIR}" lxc query /1.0/instances/c1 | jq -r '.location')"
   LXD_DIR="${LXD_ONE_DIR}" lxc move c1 --target=@default
+  LXD_DIR="${LXD_ONE_DIR}" lxc query /1.0/instances/c1 | jq -re ".location != \"$current_location\""
 
   # c1 cannot be moved within the same cluster group if it has a single member
   LXD_DIR="${LXD_ONE_DIR}" lxc move c1 --target=@foobar3