Re: [libvirt] [PATCH V2 08/13] libxl: use job functions in domain save operations

[Daniel P. Berrange]

On Wed, Feb 12, 2014 at 06:56:22PM -0700, Jim Fehlig wrote:
 Saving domain memory and cpu state can take considerable time.
 Use the recently added job functions and unlock the virDomainObj
 while saving the domain.
 
 Signed-off-by: Jim Fehlig jfeh...@suse.com
 ---
 
 V2: Check libxlDomainObjEndJob() return value
 
  src/libxl/libxl_driver.c | 56 
 +++-
  1 file changed, 41 insertions(+), 15 deletions(-)

ACK

Daniel
-- 
|: http://berrange.com  -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org  -o- http://virt-manager.org :|
|: http://autobuild.org   -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org   -o-   http://live.gnome.org/gtk-vnc :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH V2 08/13] libxl: use job functions in domain save operations

[Jim Fehlig]

Saving domain memory and cpu state can take considerable time.
Use the recently added job functions and unlock the virDomainObj
while saving the domain.

Signed-off-by: Jim Fehlig jfeh...@suse.com
---

V2: Check libxlDomainObjEndJob() return value

 src/libxl/libxl_driver.c | 56 +++-
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 0c2c1d7..839754d 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1902,10 +1902,16 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, 
virDomainObjPtr vm,
 goto cleanup;
 }
 
-if (libxl_domain_suspend(priv-ctx, vm-def-id, fd, 0, NULL) != 0) {
+/* Unlock virDomainObj while saving domain */
+virObjectUnlock(vm);
+ret = libxl_domain_suspend(priv-ctx, vm-def-id, fd, 0, NULL);
+virObjectLock(vm);
+
+if (ret != 0) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_(Failed to save domain '%d' with libxenlight),
vm-def-id);
+ret = -1;
 goto cleanup;
 }
 
@@ -1938,6 +1944,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, 
const char *dxml,
 libxlDriverPrivatePtr driver = dom-conn-privateData;
 virDomainObjPtr vm;
 int ret = -1;
+bool remove_dom = false;
 
 virCheckFlags(0, -1);
 if (dxml) {
@@ -1952,22 +1959,31 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, 
const char *dxml,
 if (virDomainSaveFlagsEnsureACL(dom-conn, vm-def)  0)
 goto cleanup;
 
+if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY)  0)
+goto cleanup;
+
 if (!virDomainObjIsActive(vm)) {
 virReportError(VIR_ERR_OPERATION_INVALID, %s, _(Domain is not 
running));
-goto cleanup;
+goto endjob;
 }
 
 if (libxlDoDomainSave(driver, vm, to)  0)
-goto cleanup;
+goto endjob;
 
-if (!vm-persistent) {
-virDomainObjListRemove(driver-domains, vm);
-vm = NULL;
-}
+if (!vm-persistent)
+remove_dom = true;
 
 ret = 0;
 
+endjob:
+if (!libxlDomainObjEndJob(driver, vm))
+vm = NULL;
+
 cleanup:
+if (remove_dom  vm) {
+virDomainObjListRemove(driver-domains, vm);
+vm = NULL;
+}
 if (vm)
 virObjectUnlock(vm);
 return ret;
@@ -2129,6 +2145,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int 
flags)
 virDomainObjPtr vm = NULL;
 char *name = NULL;
 int ret = -1;
+bool remove_dom = false;
 
 virCheckFlags(0, -1);
 
@@ -2138,33 +2155,42 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int 
flags)
 if (virDomainManagedSaveEnsureACL(dom-conn, vm-def)  0)
 goto cleanup;
 
+if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY)  0)
+goto cleanup;
+
 if (!virDomainObjIsActive(vm)) {
 virReportError(VIR_ERR_OPERATION_INVALID, %s, _(Domain is not 
running));
-goto cleanup;
+goto endjob;
 }
 if (!vm-persistent) {
 virReportError(VIR_ERR_OPERATION_INVALID, %s,
_(cannot do managed save for transient domain));
-goto cleanup;
+goto endjob;
 }
 
 name = libxlDomainManagedSavePath(driver, vm);
 if (name == NULL)
-goto cleanup;
+goto endjob;
 
 VIR_INFO(Saving state to %s, name);
 
 if (libxlDoDomainSave(driver, vm, name)  0)
-goto cleanup;
+goto endjob;
 
-if (!vm-persistent) {
-virDomainObjListRemove(driver-domains, vm);
-vm = NULL;
-}
+if (!vm-persistent)
+remove_dom = true;
 
 ret = 0;
 
+endjob:
+if (!libxlDomainObjEndJob(driver, vm))
+vm = NULL;
+
 cleanup:
+if (remove_dom  vm) {
+virDomainObjListRemove(driver-domains, vm);
+vm = NULL;
+}
 if (vm)
 virObjectUnlock(vm);
 VIR_FREE(name);
-- 
1.8.1.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list