Re: [libvirt] [PATCH V2 09/13] libxl: use job functions in libxlDomainCoreDump

2014-02-19 Thread Daniel P. Berrange 
On Wed, Feb 12, 2014 at 06:56:23PM -0700, Jim Fehlig wrote:
 Dumping a domain's core can take considerable time.  Use the
 recently added job functions and unlock the virDomainObj while
 dumping core.
 
 Signed-off-by: Jim Fehlig jfeh...@suse.com
 ---
 
 V2: Check libxlDomainObjEndJob() return value
 
  src/libxl/libxl_driver.c | 38 +++---
  1 file changed, 27 insertions(+), 11 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 09/13] libxl: use job functions in libxlDomainCoreDump

2014-02-12 Thread Jim Fehlig 
Dumping a domain's core can take considerable time.  Use the
recently added job functions and unlock the virDomainObj while
dumping core.

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

V2: Check libxlDomainObjEndJob() return value

 src/libxl/libxl_driver.c | 38 +++---
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 839754d..9c42e28 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -2063,6 +2063,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, 
unsigned int flags)
 libxlDomainObjPrivatePtr priv;
 virDomainObjPtr vm;
 virObjectEventPtr event = NULL;
+bool remove_dom = false;
 bool paused = false;
 int ret = -1;
 
@@ -2074,9 +2075,12 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, 
unsigned int flags)
 if (virDomainCoreDumpEnsureACL(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;
 }
 
 priv = vm-privateData;
@@ -2088,39 +2092,42 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, 
unsigned int flags)
_(Before dumping core, failed to suspend domain 
'%d'
   with libxenlight),
dom-id);
-goto cleanup;
+goto endjob;
 }
 virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_DUMP);
 paused = true;
 }
 
-if (libxl_domain_core_dump(priv-ctx, dom-id, to, NULL) != 0) {
+/* Unlock virDomainObj while dumping core */
+virObjectUnlock(vm);
+ret = libxl_domain_core_dump(priv-ctx, dom-id, to, NULL);
+virObjectLock(vm);
+if (ret != 0) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_(Failed to dump core of domain '%d' with 
libxenlight),
dom-id);
-goto cleanup_unpause;
+ret = -1;
+goto unpause;
 }
 
 if (flags  VIR_DUMP_CRASH) {
 if (libxl_domain_destroy(priv-ctx, dom-id, NULL)  0) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_(Failed to destroy domain '%d'), dom-id);
-goto cleanup_unpause;
+goto unpause;
 }
 
 libxlVmCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED);
 event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
  VIR_DOMAIN_EVENT_STOPPED_CRASHED);
-if (!vm-persistent) {
-virDomainObjListRemove(driver-domains, vm);
-vm = NULL;
-}
+if (!vm-persistent)
+remove_dom = true;
 }
 
 ret = 0;
 
-cleanup_unpause:
-if (vm  virDomainObjIsActive(vm)  paused) {
+unpause:
+if (virDomainObjIsActive(vm)  paused) {
 if (libxl_domain_unpause(priv-ctx, dom-id) != 0) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_(After dumping core, failed to resume domain '%d' 
with
@@ -2130,7 +2137,16 @@ cleanup_unpause:
  VIR_DOMAIN_RUNNING_UNPAUSED);
 }
 }
+
+endjob:
+if (!libxlDomainObjEndJob(driver, vm))
+vm = NULL;
+
 cleanup:
+if (remove_dom  vm) {
+virDomainObjListRemove(driver-domains, vm);
+vm = NULL;
+}
 if (vm)
 virObjectUnlock(vm);
 if (event)
-- 
1.8.1.4

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