Updated Branches: refs/heads/object_store 83b080c4b -> 04b5f5339
Removed unused code handling for DeleteSnapshotBackupCommand since we don't send that command anymore. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04b5f533 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04b5f533 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04b5f533 Branch: refs/heads/object_store Commit: 04b5f53392965157ffdf1883ddd145c47e896ae3 Parents: 83b080c Author: Min Chen <min.c...@citrix.com> Authored: Fri Jun 7 17:55:05 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Fri Jun 7 17:55:05 2013 -0700 ---------------------------------------------------------------------- .../storage/test/MockLocalHostEndPoint.java | 4 +- .../kvm/resource/LibvirtComputingResource.java | 31 ------------ .../resource/NfsSecondaryStorageResource.java | 38 --------------- 3 files changed, 2 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04b5f533/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java index 26c1a63..74caba3 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java @@ -20,17 +20,17 @@ package org.apache.cloudstack.storage.test; import org.apache.cloudstack.storage.LocalHostEndpoint; import org.apache.cloudstack.storage.command.CopyCommand; +import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.command.DownloadCommand; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; -import com.cloud.agent.api.DeleteSnapshotBackupCommand; public class MockLocalHostEndPoint extends LocalHostEndpoint { @Override public Answer sendMessage(Command cmd) { if ((cmd instanceof CopyCommand) || (cmd instanceof DownloadCommand) - || (cmd instanceof DeleteSnapshotBackupCommand)) { + || (cmd instanceof DeleteCommand)) { return resource.executeRequest(cmd); } // TODO Auto-generated method stub http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04b5f533/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 50187ce..e77b285 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 @@ -2091,37 +2091,6 @@ ServerResource { + File.separator + snapshotName, true); } - protected DeleteSnapshotBackupAnswer execute( - final DeleteSnapshotBackupCommand cmd) { - Long dcId = cmd.getDataCenterId(); - 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("-n", cmd.getSnapshotName()); - - command.execute(); - } catch (CloudRuntimeException e) { - return new DeleteSnapshotBackupAnswer(cmd, false, e.toString()); - } finally { - if (secondaryStoragePool != null) { - _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid()); - } - } - return new DeleteSnapshotBackupAnswer(cmd, true, null); - } - protected CreateVolumeFromSnapshotAnswer execute( final CreateVolumeFromSnapshotCommand cmd) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04b5f533/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java ---------------------------------------------------------------------- diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 2fca6c0..be352db 100755 --- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -65,7 +65,6 @@ import com.cloud.agent.api.CheckHealthAnswer; import com.cloud.agent.api.CheckHealthCommand; import com.cloud.agent.api.Command; import com.cloud.agent.api.ComputeChecksumCommand; -import com.cloud.agent.api.DeleteSnapshotBackupCommand; import com.cloud.agent.api.DeleteSnapshotsDirCommand; import com.cloud.agent.api.DownloadSnapshotFromS3Command; import com.cloud.agent.api.DownloadSnapshotFromSwiftCommand; @@ -197,8 +196,6 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S return execute((DownloadSnapshotFromSwiftCommand) cmd); } else if (cmd instanceof DownloadSnapshotFromS3Command) { return execute((DownloadSnapshotFromS3Command) cmd); - } else if (cmd instanceof DeleteSnapshotBackupCommand) { - return execute((DeleteSnapshotBackupCommand) cmd); } else if (cmd instanceof DeleteSnapshotsDirCommand) { return execute((DeleteSnapshotsDirCommand) cmd); } else if (cmd instanceof DownloadTemplateFromSwiftToSecondaryStorageCommand) { @@ -1284,41 +1281,6 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S } - protected Answer execute(final DeleteSnapshotBackupCommand cmd) { - Long accountId = cmd.getAccountId(); - Long volumeId = cmd.getVolumeId(); - String name = cmd.getSnapshotUuid(); - DataStoreTO dstore = cmd.getDataStore(); - if (dstore instanceof NfsTO) { - final String result = deleteSnapshotBackupFromLocalFileSystem(((NfsTO) dstore).getUrl(), accountId, volumeId, name, cmd.isAll()); - if (result != null) { - s_logger.warn(result); - return new Answer(cmd, false, result); - } - } else if (dstore instanceof S3TO) { - final String result = deleteSnapshotBackupfromS3((S3TO) dstore, accountId, volumeId, name, cmd.isAll()); - if (result != null) { - s_logger.warn(result); - return new Answer(cmd, false, result); - } - } else if (dstore instanceof SwiftTO) { - String filename; - if (cmd.isAll()) { - filename = ""; - } else { - filename = name; - } - String result = swiftDelete((SwiftTO) dstore, "V-" + volumeId.toString(), filename); - if (result != null) { - String errMsg = "failed to delete snapshot " + filename + " , err=" + result; - s_logger.warn(errMsg); - return new Answer(cmd, false, errMsg); - } - } else { - return new Answer(cmd, false, "Unsupported image data store: " + dstore); - } - return new Answer(cmd, true, "success"); - } Map<String, TemplateProp> swiftListTemplate(SwiftTO swift) { String[] containers = swiftList(swift, "", "");
