You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/12/06 20:02:51 UTC
[1/6] git commit: updated refs/heads/4.6 to f66e782
Repository: cloudstack
Updated Branches:
refs/heads/4.6 998b1ba62 -> f66e78279
CLOUDSTACK-8845: set isRevertable of snapshot to false if the volume is removed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52412286
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52412286
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52412286
Branch: refs/heads/4.6
Commit: 52412286c657d384f86441095f5cbef510dd8763
Parents: 9a21873
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 08:18:09 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 08:21:11 2015 +0100
----------------------------------------------------------------------
.../snapshot/StorageSystemSnapshotStrategy.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52412286/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
index 2c71525..d1470e4 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
@@ -442,6 +442,12 @@ public class StorageSystemSnapshotStrategy extends SnapshotStrategyBase {
public StrategyPriority canHandle(Snapshot snapshot, SnapshotOperation op) {
long volumeId = snapshot.getVolumeId();
VolumeVO volumeVO = _volumeDao.findById(volumeId);
+ if (SnapshotOperation.REVERT.equals(op)) {
+ if (volumeVO != null && ImageFormat.QCOW2.equals(volumeVO.getFormat()))
+ return StrategyPriority.DEFAULT;
+ else
+ return StrategyPriority.CANT_HANDLE;
+ }
long storagePoolId;
@@ -459,13 +465,6 @@ public class StorageSystemSnapshotStrategy extends SnapshotStrategyBase {
storagePoolId = volumeVO.getPoolId();
}
- if (SnapshotOperation.REVERT.equals(op)) {
- if (volumeVO != null && ImageFormat.QCOW2.equals(volumeVO.getFormat()))
- return StrategyPriority.DEFAULT;
- else
- return StrategyPriority.CANT_HANDLE;
- }
-
DataStore dataStore = _dataStoreMgr.getDataStore(storagePoolId, DataStoreRole.Primary);
Map<String, String> mapCapabilities = dataStore.getDriver().getCapabilities();
[6/6] git commit: updated refs/heads/4.6 to f66e782
Posted by da...@apache.org.
Merge pull request #1177 from ustcweizhou/Ovm3-CopyCommand
CLOUDSTACK-8964: Ovm3HypervisorGuru handle only srcData with HypervisorType is Ovm3This PR can only be applied after PR #1176
The CopyCommand on Ovm3 should be handled by Ovm3StorageProcessor, not SSVM.
Hence, I revert two commits on Ovm3HypervisorGuru, and add the hypervisorType check so that only the this guru will only handle Ovm3 (not KVM)
* pr/1177:
CLOUDSTACK-8964: Ovm3HypervisorGuru handle only srcData with HypervisorType is Ovm3
Revert "simple change to prevent failure and keep OVM3 snapshots working"
Revert "CLOUDSTACK-8964 side effect isolation"
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f66e7827
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f66e7827
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f66e7827
Branch: refs/heads/4.6
Commit: f66e78279571dcc339bf18e37b5b7f22c4711b9b
Parents: 24113e4 a90b953
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 20:02:17 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 20:02:17 2015 +0100
----------------------------------------------------------------------
.../ovm3/resources/Ovm3HypervisorGuru.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[4/6] git commit: updated refs/heads/4.6 to f66e782
Posted by da...@apache.org.
CLOUDSTACK-8964: Ovm3HypervisorGuru handle only srcData with HypervisorType is Ovm3
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a90b953d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a90b953d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a90b953d
Branch: refs/heads/4.6
Commit: a90b953dbcb80cba09e03f34f96a7a52c0521d4f
Parents: 69e031d
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 18:26:12 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 19:19:04 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a90b953d/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
index 6ec7741..4d222bb 100755
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
@@ -96,18 +96,16 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
DataTO srcData = cpyCommand.getSrcTO();
DataTO destData = cpyCommand.getDestTO();
- if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) {
+ if (HypervisorType.Ovm3.equals(srcData.getHypervisorType()) && srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) {
LOGGER.debug("Snapshot to Template: " + cmd);
DataStoreTO srcStore = srcData.getDataStore();
DataStoreTO destStore = destData.getDataStore();
if (srcStore instanceof NfsTO && destStore instanceof NfsTO) {
HostVO host = hostDao.findById(hostId);
EndPoint ep = endPointSelector.selectHypervisorHost(new ZoneScope(host.getDataCenterId()));
- host = hostDao.findById(ep.getId());
- hostDao.loadDetails(host);
- // String snapshotHotFixVersion = host.getDetail(XenserverConfigs.XS620HotFix);
- // if (snapshotHotFixVersion != null && snapshotHotFixVersion.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)) {
- return new Pair<Boolean, Long>(Boolean.TRUE, Long.valueOf(ep.getId()));
+ if (ep != null) {
+ return new Pair<Boolean, Long>(Boolean.TRUE, Long.valueOf(ep.getId()));
+ }
}
}
}
[2/6] git commit: updated refs/heads/4.6 to f66e782
Posted by da...@apache.org.
Revert "CLOUDSTACK-8964 side effect isolation"
This reverts commit fc18d1e8b11c82a18854234b0c8c827896a5b78d.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0501be8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0501be8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0501be8
Branch: refs/heads/4.6
Commit: e0501be87ea3a171afba03086139355bb3dc6051
Parents: 4f6ff6c
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 18:18:15 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 18:18:15 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0501be8/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
index 3711bbf..5a2e39b 100755
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
@@ -87,15 +87,6 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
*/
public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
LOGGER.debug("getCommandHostDelegation: " + cmd.getClass());
- performSideEffectsForDelegationOnCommand(hostId, cmd);
- return new Pair<Boolean, Long>(Boolean.FALSE, Long.valueOf(hostId));
- }
-
- /**
- * @param hostId
- * @param cmd
- */
- void performSideEffectsForDelegationOnCommand(long hostId, Command cmd) {
if (cmd instanceof StorageSubSystemCommand) {
StorageSubSystemCommand c = (StorageSubSystemCommand)cmd;
c.setExecuteInSequence(true);
@@ -117,5 +108,6 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
}
}
}
+ return new Pair<Boolean, Long>(Boolean.FALSE, Long.valueOf(hostId));
}
}
[5/6] git commit: updated refs/heads/4.6 to f66e782
Posted by da...@apache.org.
Merge pull request #1168 from ustcweizhou/listSnapshots-Exception
CLOUDSTACK-8845: set isRevertable of snapshot to false if the volume is removedSome users encounter an exception when listSnapshots.
We should set the isRevertable of snapshot to false if the original volume is removed, without checking if the snapshot is stored in primary store (the exception was thowned during the checking).
* pr/1168:
CLOUDSTACK-8845: set isRevertable of snapshot to false if the volume is removed
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24113e42
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24113e42
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24113e42
Branch: refs/heads/4.6
Commit: 24113e425e6cd213ffac568abc9fb7a55ae8d7e8
Parents: 998b1ba 5241228
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 19:48:45 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 19:48:45 2015 +0100
----------------------------------------------------------------------
.../snapshot/StorageSystemSnapshotStrategy.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: updated refs/heads/4.6 to f66e782
Posted by da...@apache.org.
Revert "simple change to prevent failure and keep OVM3 snapshots working"
This reverts commit 66fed462b64c8e3fe9e7ee39c7a1c07ff33108f9.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/69e031d9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/69e031d9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/69e031d9
Branch: refs/heads/4.6
Commit: 69e031d9beb662f28d0c5ca46ac19a6280ee2d4e
Parents: e0501be
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 18:18:28 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 18:18:28 2015 +0100
----------------------------------------------------------------------
.../com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69e031d9/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
index 5a2e39b..6ec7741 100755
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
@@ -105,6 +105,9 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
EndPoint ep = endPointSelector.selectHypervisorHost(new ZoneScope(host.getDataCenterId()));
host = hostDao.findById(ep.getId());
hostDao.loadDetails(host);
+ // String snapshotHotFixVersion = host.getDetail(XenserverConfigs.XS620HotFix);
+ // if (snapshotHotFixVersion != null && snapshotHotFixVersion.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)) {
+ return new Pair<Boolean, Long>(Boolean.TRUE, Long.valueOf(ep.getId()));
}
}
}