use libvirt getJobInfo for live migration tracking

Signed-off-by: Vladik Romanovsky <[email protected]>
portalgun-io · Mar 1, 2019 · 927f7a0 · 927f7a0
1 parent 705fa3c
commit 927f7a0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/pkg/virt-launcher/virtwrap/cli/generated_mock_libvirt.go b/pkg/virt-launcher/virtwrap/cli/generated_mock_libvirt.go
@@ -379,6 +379,17 @@ func (_mr *_MockVirDomainRecorder) GetJobStats(arg0 interface{}) *gomock.Call {
 	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetJobStats", arg0)
 }
 
+func (_m *MockVirDomain) GetJobInfo() (*libvirt_go.DomainJobInfo, error) {
+	ret := _m.ctrl.Call(_m, "GetJobInfo")
+	ret0, _ := ret[0].(*libvirt_go.DomainJobInfo)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+func (_mr *_MockVirDomainRecorder) GetJobInfo() *gomock.Call {
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetJobInfo")
+}
+
 func (_m *MockVirDomain) AbortJob() error {
 	ret := _m.ctrl.Call(_m, "AbortJob")
 	ret0, _ := ret[0].(error)

diff --git a/pkg/virt-launcher/virtwrap/cli/libvirt.go b/pkg/virt-launcher/virtwrap/cli/libvirt.go
@@ -331,6 +331,7 @@ type VirDomain interface {
 	MigrateToURI3(string, *libvirt.DomainMigrateParameters, libvirt.DomainMigrateFlags) error
 	MemoryStats(nrStats uint32, flags uint32) ([]libvirt.DomainMemoryStat, error)
 	GetJobStats(flags libvirt.DomainGetJobStatsFlags) (*libvirt.DomainJobInfo, error)
+	GetJobInfo() (*libvirt.DomainJobInfo, error)
 	AbortJob() error
 	Free() error
 }

diff --git a/pkg/virt-launcher/virtwrap/manager.go b/pkg/virt-launcher/virtwrap/manager.go
@@ -419,7 +419,7 @@ func liveMigrationMonitor(vmi *v1.VirtualMachineInstance, dom cli.VirDomain) {
 	completionTimeoutPerGiB := int64(800)
 	acceptableCompletionTime := completionTimeoutPerGiB * getVMIMigrationDataSize(vmi)
 	for {
-		stats, err := dom.GetJobStats(0)
+		stats, err := dom.GetJobInfo()
 		if err != nil {
 			logger.Reason(err).Error("failed to get domain job info")
 			break