You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/05/30 00:22:29 UTC
git commit: updated refs/heads/object_store to bc91e76
Updated Branches:
refs/heads/object_store 8a1a51c6f -> bc91e7692
Fix build.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bc91e769
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bc91e769
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bc91e769
Branch: refs/heads/object_store
Commit: bc91e7692decfa35bbcfb38b8059a47ced1d60d2
Parents: 8a1a51c
Author: Min Chen <mi...@citrix.com>
Authored: Wed May 29 15:22:04 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Wed May 29 15:22:04 2013 -0700
----------------------------------------------------------------------
.../cloudstack/storage/test/volumeServiceTest.java | 1 -
.../kvm/resource/LibvirtComputingResource.java | 29 ---------------
2 files changed, 0 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc91e769/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
index 243d3b2..4e22101 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
@@ -44,7 +44,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult;
-import org.apache.cloudstack.engine.subsystem.api.storage.type.RootDisk;
import org.apache.cloudstack.framework.async.AsyncCallFuture;
import org.apache.cloudstack.storage.RemoteHostEndPoint;
import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc91e769/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index ee8531b..50187ce 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -2122,35 +2122,6 @@ ServerResource {
return new DeleteSnapshotBackupAnswer(cmd, true, null);
}
- protected Answer execute(DeleteSnapshotsDirCommand cmd) {
- Long dcId = cmd.getDcId();
- Long accountId = cmd.getAccountId();
- Long volumeId = cmd.getVolumeId();
- KVMStoragePool secondaryStoragePool = null;
- try {
- secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI(cmd
- .getSecondaryStorageUrl());
-
- String ssPmountPath = secondaryStoragePool.getLocalPath();
- String snapshotDestPath = ssPmountPath + File.separator
- + "snapshots" + File.separator + dcId + File.separator
- + accountId + File.separator + volumeId;
-
- final Script command = new Script(_manageSnapshotPath,
- _cmdsTimeout, s_logger);
- command.add("-d", snapshotDestPath);
- command.add("-f");
- command.execute();
- } catch (CloudRuntimeException e) {
- return new Answer(cmd, false, e.toString());
- } finally {
- if (secondaryStoragePool != null) {
- _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
- }
-
- }
- return new Answer(cmd, true, null);
- }
protected CreateVolumeFromSnapshotAnswer execute(
final CreateVolumeFromSnapshotCommand cmd) {