Use DeepCopy() to copy migration configs

- Also add log entry for matched configs Signed-off-by: Itamar Holder <iholder@redhat.com>
kubevirt · Mar 22, 2022 · 87251d2 · 87251d2
1 parent a8c601a
commit 87251d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkg/virt-controller/watch/migration.go b/pkg/virt-controller/watch/migration.go
@@ -671,15 +671,14 @@ func (c *MigrationController) handleTargetPodHandoff(migration *virtv1.VirtualMa
 		}
 	}
 
-	clusterMigrationConfigs := c.clusterConfig.GetMigrationConfiguration()
+	clusterMigrationConfigs := c.clusterConfig.GetMigrationConfiguration().DeepCopy()
 	err := c.matchMigrationPolicy(vmiCopy, clusterMigrationConfigs)
 	if err != nil {
 		return fmt.Errorf("failed to match migration policy: %v", err)
 	}
 
 	if !c.isMigrationPolicyMatched(vmiCopy) {
-		clusterMigrationConfigsCopy := *clusterMigrationConfigs
-		vmiCopy.Status.MigrationState.MigrationConfiguration = &clusterMigrationConfigsCopy
+		vmiCopy.Status.MigrationState.MigrationConfiguration = clusterMigrationConfigs
 	}
 
 	err = c.patchVMI(vmi, vmiCopy)
@@ -1594,15 +1593,14 @@ func (c *MigrationController) matchMigrationPolicy(vmi *virtv1.VirtualMachineIns
 		return nil
 	}
 
-	migrationConfigCopy := *clusterMigrationConfiguration
-	isUpdated, err := matchedPolicy.GetMigrationConfByPolicy(&migrationConfigCopy)
+	isUpdated, err := matchedPolicy.GetMigrationConfByPolicy(clusterMigrationConfiguration)
 	if err != nil {
 		return err
 	}
 
 	if isUpdated {
 		vmi.Status.MigrationState.MigrationPolicyName = &matchedPolicy.Name
-		vmi.Status.MigrationState.MigrationConfiguration = &migrationConfigCopy
+		vmi.Status.MigrationState.MigrationConfiguration = clusterMigrationConfiguration
 		log.Log.Object(vmi).Infof("migration is updated by migration policy named %s.", matchedPolicy.Name)
 	}
 

diff --git a/pkg/virt-handler/vm.go b/pkg/virt-handler/vm.go
@@ -2346,6 +2346,7 @@ func (d *VirtualMachineController) vmUpdateHelperMigrationSource(origVMI *v1.Vir
 			AllowAutoConverge:       *migrationConfiguration.AllowAutoConverge,
 			AllowPostCopy:           *migrationConfiguration.AllowPostCopy,
 		}
+		log.Log.Object(vmi).Infof("migration options matched for vmi %s: %+v", vmi.Name, options)
 
 		err = client.MigrateVirtualMachine(vmi, options)
 		if err != nil {