You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/08/13 23:51:14 UTC
git commit: updated refs/heads/master to c3bc9d6
Updated Branches:
refs/heads/master 7d8941847 -> c3bc9d65d
Remove unused method deleteVbdByPath from KVM storage classes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3bc9d65
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3bc9d65
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3bc9d65
Branch: refs/heads/master
Commit: c3bc9d65ddb41fe9ffd8936e5bb58ad2d6d1c409
Parents: 7d89418
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Aug 13 23:51:05 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Aug 13 23:51:05 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/c3bc9d65/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/c3bc9d65/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/c3bc9d65/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);
-
}