You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/09/15 10:57:41 UTC

[1/2] git commit: updated refs/heads/master to 34caa69

Repository: cloudstack
Updated Branches:
  refs/heads/master 2bd61c35b -> 34caa694d


CLOUDSTACK-8645: Improve logging of RBD functionality in KVM

A simple commit which changes a couple of log lines.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f409a7c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f409a7c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f409a7c

Branch: refs/heads/master
Commit: 4f409a7c173d2a2dd0e400dcd1ba426a1af66425
Parents: d091b91
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Sep 14 13:50:53 2015 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Sep 15 10:10:04 2015 +0200

----------------------------------------------------------------------
 .../kvm/storage/LibvirtStorageAdaptor.java          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f409a7c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 6ef5b24..f656982 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -273,7 +273,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                         s.undefine();
                         s.free();
                     } catch (LibvirtException l) {
-                        s_logger.debug("Failed to undefine the libvirt secret: " + l.toString());
+                        s_logger.error("Failed to undefine the libvirt secret: " + l.toString());
                     }
                 }
                 return null;
@@ -288,7 +288,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
             sp = conn.storagePoolCreateXML(spd.toString(), 0);
             return sp;
         } catch (LibvirtException e) {
-            s_logger.debug("Failed to create RBD storage pool: " + e.toString());
+            s_logger.error("Failed to create RBD storage pool: " + e.toString());
             if (sp != null) {
                 try {
                     if (sp.isPersistent() == 1) {
@@ -299,17 +299,17 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                     }
                     sp.free();
                 } catch (LibvirtException l) {
-                    s_logger.debug("Failed to undefine RBD storage pool: " + l.toString());
+                    s_logger.error("Failed to undefine RBD storage pool: " + l.toString());
                 }
             }
 
             if (s != null) {
                 try {
-                    s_logger.debug("Failed to create the RBD storage pool, cleaning up the libvirt secret");
+                    s_logger.error("Failed to create the RBD storage pool, cleaning up the libvirt secret");
                     s.undefine();
                     s.free();
                 } catch (LibvirtException se) {
-                    s_logger.debug("Failed to remove the libvirt secret: " + se.toString());
+                    s_logger.error("Failed to remove the libvirt secret: " + se.toString());
                 }
             }
 
@@ -615,7 +615,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
         try {
             s = conn.secretLookupByUUIDString(uuid);
         } catch (LibvirtException e) {
-            s_logger.debug("Storage pool " + uuid + " has no corresponding secret. Not removing any secret.");
+            s_logger.info("Storage pool " + uuid + " has no corresponding secret. Not removing any secret.");
         }
 
         try {
@@ -877,8 +877,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 rbd.close(image);
                 r.ioCtxDestroy(io);
 
-                s_logger.debug("Succesfully unprotected and removed any snapshots of " + pool.getSourceDir() + "/" + uuid +
-                        " Continuing to remove the RBD image");
+                s_logger.info("Succesfully unprotected and removed any remaining snapshots (" + snaps.size() + ") of "
+                              + pool.getSourceDir() + "/" + uuid + " Continuing to remove the RBD image");
             } catch (RadosException e) {
                 throw new CloudRuntimeException(e.toString());
             } catch (RbdException e) {


[2/2] git commit: updated refs/heads/master to 34caa69

Posted by wi...@apache.org.
Merge pull request #821 from wido/libvirt-rbd-logging

CLOUDSTACK-8645: Improve logging of RBD functionality in KVMA simple commit which changes a couple of log lines.

* pr/821:
  CLOUDSTACK-8645: Improve logging of RBD functionality in KVM

Signed-off-by: Wido den Hollander <wi...@widodh.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34caa694
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34caa694
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34caa694

Branch: refs/heads/master
Commit: 34caa694d0a788d649408d83719e87110d098410
Parents: 2bd61c3 4f409a7
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Sep 15 10:57:18 2015 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Sep 15 10:57:18 2015 +0200

----------------------------------------------------------------------
 .../kvm/storage/LibvirtStorageAdaptor.java          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------