use the migration config in migration monitor

Signed-off-by: Vladik Romanovsky <[email protected]>
portalgun-io · Mar 1, 2019 · 69a22e9 · 69a22e9
1 parent da12ac3
commit 69a22e9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/pkg/virt-launcher/virtwrap/manager.go b/pkg/virt-launcher/virtwrap/manager.go
@@ -412,11 +412,21 @@ func liveMigrationMonitor(vmi *v1.VirtualMachineInstance, dom cli.VirDomain, l *
 	start := time.Now().UTC().Unix()
 	lastProgressUpdate := start
 	progressWatermark := int64(0)
-	// TODO:(vladikr) move to configMap
-	progressTimeout := int64(150)
 
-	// TODO:(vladikr) move to configMap
+	progressTimeout := int64(150)
 	completionTimeoutPerGiB := int64(800)
+
+	// update timeouts from migration config
+	conf := vmi.Status.MigrationState
+	if conf != nil {
+		if conf.CompletionTimeoutPerGiB != 0 {
+			completionTimeoutPerGiB = conf.CompletionTimeoutPerGiB
+		}
+		if conf.ProgressTimeout != 0 {
+			progressTimeout = conf.ProgressTimeout
+		}
+	}
+
 	acceptableCompletionTime := completionTimeoutPerGiB * getVMIMigrationDataSize(vmi)
 monitorLoop:
 	for {

diff --git a/pkg/virt-launcher/virtwrap/manager_test.go b/pkg/virt-launcher/virtwrap/manager_test.go
@@ -221,11 +221,9 @@ var _ = Describe("Manager", func() {
 
 			vmi := newVMI(testNamespace, testVmName)
 			vmi.Status.MigrationState = &v1.VirtualMachineInstanceMigrationState{
-				MigrationUID: "111222333",
-			}
-			migrationConfig := &v1.MigrationConfig{
-				CompletionTimeoutPerGiB: 800,
+				MigrationUID:            "111222333",
 				ProgressTimeout:         2,
+				CompletionTimeoutPerGiB: 300,
 			}
 
 			domainSpec := expectIsolationDetectionForVMI(vmi)
@@ -244,7 +242,7 @@ var _ = Describe("Manager", func() {
 			mockDomain.EXPECT().GetXMLDesc(gomock.Eq(libvirt.DOMAIN_XML_MIGRATABLE)).Return(string(xml), nil)
 			mockDomain.EXPECT().GetXMLDesc(gomock.Eq(libvirt.DOMAIN_XML_INACTIVE)).Return(string(xml), nil)
 
-			liveMigrationMonitor(vmi, mockDomain, manager, migrationConfig)
+			liveMigrationMonitor(vmi, mockDomain, manager)
 		})
 		It("migration should be canceled if timeout has been reached", func() {
 			// Make sure that we always free the domain after use
@@ -260,11 +258,9 @@ var _ = Describe("Manager", func() {
 
 			vmi := newVMI(testNamespace, testVmName)
 			vmi.Status.MigrationState = &v1.VirtualMachineInstanceMigrationState{
-				MigrationUID: "111222333",
-			}
-			migrationConfig := &v1.MigrationConfig{
-				CompletionTimeoutPerGiB: 3,
-				ProgressTimeout:         150,
+				MigrationUID:            "111222333",
+				ProgressTimeout:         3,
+				CompletionTimeoutPerGiB: 150,
 			}
 
 			domainSpec := expectIsolationDetectionForVMI(vmi)
@@ -283,7 +279,7 @@ var _ = Describe("Manager", func() {
 			mockDomain.EXPECT().GetXMLDesc(gomock.Eq(libvirt.DOMAIN_XML_MIGRATABLE)).Return(string(xml), nil)
 			mockDomain.EXPECT().GetXMLDesc(gomock.Eq(libvirt.DOMAIN_XML_INACTIVE)).Return(string(xml), nil)
 
-			liveMigrationMonitor(vmi, mockDomain, manager, migrationConfig)
+			liveMigrationMonitor(vmi, mockDomain, manager)
 		})
 
 	})