cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/4.2 to 7f63128
Date Tue, 13 Aug 2013 21:52:00 GMT
Updated Branches:
  refs/heads/4.2 9505523ec -> 7f6312806


Remove unused method deleteVbdByPath from KVM storage classes
(cherry picked from commit c3bc9d65ddb41fe9ffd8936e5bb58ad2d6d1c409)


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

Branch: refs/heads/4.2
Commit: 7f631280616d65d753633f0b1b0a899f65f2be89
Parents: 9505523
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Aug 13 23:51:05 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Tue Aug 13 23:51:48 2013 +0200

----------------------------------------------------------------------
 .../kvm/storage/KVMStoragePoolManager.java          |  5 -----
 .../kvm/storage/LibvirtStorageAdaptor.java          | 16 ----------------
 .../hypervisor/kvm/storage/StorageAdaptor.java      |  2 --
 3 files changed, 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f631280/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index 31d491c..31d6179 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -131,11 +131,6 @@ public class KVMStoragePoolManager {
         return true;
     }
 
-    public boolean deleteVbdByPath(StoragePoolType type, String diskPath) {
-        StorageAdaptor adaptor = getStorageAdaptor(type);
-        return adaptor.deleteVbdByPath(diskPath);
-    }
-
     public KVMPhysicalDisk createDiskFromTemplate(KVMPhysicalDisk template, String name,
                                                     KVMStoragePool destPool) {
         StorageAdaptor adaptor = getStorageAdaptor(destPool.getType());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f631280/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 28cfd42..41df310 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
@@ -1147,22 +1147,6 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
         return deleteStoragePool(pool.getUuid());
     }
 
-    public boolean deleteVbdByPath(String diskPath) {
-        Connect conn;
-        try {
-            conn = LibvirtConnection.getConnection();
-            StorageVol vol = conn.storageVolLookupByPath(diskPath);
-            if(vol != null) {
-                s_logger.debug("requested delete disk " + diskPath);
-                vol.delete(0);
-            }
-        } catch (LibvirtException e) {
-            s_logger.debug("Libvirt error in attempting to find and delete patch disk:" +
e.toString());
-            return false;
-        }
-        return true;
-    }
-
     // refreshPool and deleteVol are used to fix CLOUDSTACK-2729/CLOUDSTACK-2780
     // They are caused by a libvirt bug (https://bugzilla.redhat.com/show_bug.cgi?id=977706)
     // However, we also need to fix the issues in CloudStack source code.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f631280/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
index dd75677..4956d8d 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
@@ -61,6 +61,4 @@ public interface StorageAdaptor {
 
     public boolean createFolder(String uuid, String path);
 
-    public boolean deleteVbdByPath(String path);
-
 }


Mime
View raw message