cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [3/3] git commit: updated refs/heads/rbd-snap-clone to 099ceb9
Date Tue, 14 May 2013 15:44:39 GMT
rbd: Connect to the Ceph cluster before opening the IoCTX


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

Branch: refs/heads/rbd-snap-clone
Commit: 099ceb9f38462c279aeefd1aa224293303b361c4
Parents: 3bddbe8
Author: Wido den Hollander <wido@widodh.nl>
Authored: Tue May 14 17:44:07 2013 +0200
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Tue May 14 17:44:07 2013 +0200

----------------------------------------------------------------------
 .../kvm/storage/LibvirtStorageAdaptor.java         |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/099ceb9f/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 5dfe157..0024173 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
@@ -722,11 +722,12 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
 
                     if ((srcPool.getSourceHost().equals(destPool.getSourceHost())) &&
(srcPool.getSourceDir().equals(destPool.getSourceDir()))) {
                         /* We are on the same Ceph cluster, but we require RBD format 2 on
the source image */
-                        s_logger.debug("Performing a RBD clone (layering) since we are operating
in the same storage pool");
+                        s_logger.debug("Trying to perform a RBD clone (layering) since we
are operating in the same storage pool");
                         try {
                             Rados r = new Rados(srcPool.getAuthUserName());
                             r.confSet("mon_host", srcPool.getSourceHost());
                             r.confSet("key", srcPool.getAuthSecret());
+                            r.connect();
 
                             IoCTX io = r.ioCtxCreate(srcPool.getSourceDir());
                             Rbd rbd = new Rbd(io);
@@ -903,6 +904,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 Rados r = new Rados(destPool.getAuthUserName());
                 r.confSet("mon_host", destPool.getSourceHost());
                 r.confSet("key", destPool.getAuthSecret());
+                r.connect();
 
                 IoCTX io = r.ioCtxCreate(destPool.getSourceDir());
                 Rbd rbd = new Rbd(io);


Mime
View raw message