You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/02 13:39:05 UTC
[1/5] git commit: updated refs/heads/master to 9c90eff
Repository: cloudstack
Updated Branches:
refs/heads/master 30a852897 -> 9c90eff87
simple change to prevent failure and keep OVM3 snapshots working
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66fed462
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66fed462
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66fed462
Branch: refs/heads/master
Commit: 66fed462b64c8e3fe9e7ee39c7a1c07ff33108f9
Parents: cf839bd
Author: Funs Kessen <fk...@schubergphilis.com>
Authored: Fri Oct 23 15:58:40 2015 +0200
Committer: Funs Kessen <fk...@schubergphilis.com>
Committed: Fri Oct 23 15:58:40 2015 +0200
----------------------------------------------------------------------
.../com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66fed462/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..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
@@ -105,9 +105,6 @@ 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()));
}
}
}
[2/5] git commit: updated refs/heads/master to 9c90eff
Posted by re...@apache.org.
Getting volume from snapshot working again... odd
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6db4b7b0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6db4b7b0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6db4b7b0
Branch: refs/heads/master
Commit: 6db4b7b0be28617feb3367e8984f95aabff97556
Parents: 66fed46
Author: Funs Kessen <fk...@schubergphilis.com>
Authored: Fri Oct 23 16:50:26 2015 +0200
Committer: Funs Kessen <fk...@schubergphilis.com>
Committed: Fri Oct 23 16:50:26 2015 +0200
----------------------------------------------------------------------
.../com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6db4b7b0/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
index 6a1ebb2..3c28f1f 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
@@ -114,6 +114,9 @@ public class Ovm3StorageProcessor implements StorageProcessor {
} else if ((srcData.getObjectType() == DataObjectType.SNAPSHOT)
&& (destData.getObjectType() == DataObjectType.TEMPLATE)) {
return createTemplateFromSnapshot(cmd);
+ } else if ((srcData.getObjectType() == DataObjectType.SNAPSHOT)
+ && (destData.getObjectType() == DataObjectType.VOLUME)) {
+ return createVolumeFromSnapshot(cmd);
} else {
msg = "Unable to do stuff for " + srcStore.getClass() + ":"
+ srcData.getObjectType() + " to "
[4/5] git commit: updated refs/heads/master to 9c90eff
Posted by re...@apache.org.
CLOUDSTACK-8964 side effect isolation
extract side effect away to emphasize the main commandDelegation
objective
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc18d1e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc18d1e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc18d1e8
Branch: refs/heads/master
Commit: fc18d1e8b11c82a18854234b0c8c827896a5b78d
Parents: c4afb76
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Oct 30 09:00:47 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Oct 30 09:00:47 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc18d1e8/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..3711bbf 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,6 +87,15 @@ 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);
@@ -108,6 +117,5 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
}
}
}
- return new Pair<Boolean, Long>(Boolean.FALSE, Long.valueOf(hostId));
}
}
[5/5] git commit: updated refs/heads/master to 9c90eff
Posted by re...@apache.org.
Merge pull request #1015 from DaanHoogland/pr/975
CLOUDSTACK-8964: Ovm3HypervisorGuru answer fix and snapshot to volume implementation.some clean up of code after the fix from #975
* pr/1015:
CLOUDSTACK-8964 side effect isolation extract side effect away to emphasize the main commandDelegation objective
host delegation logging for XenServerGuru.java
Getting volume from snapshot working again... odd
simple change to prevent failure and keep OVM3 snapshots working
This closes #975
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c90eff8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c90eff8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c90eff8
Branch: refs/heads/master
Commit: 9c90eff87f731bdd7a433a21e756ddab11774091
Parents: 30a8528 fc18d1e
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Nov 2 13:36:29 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Nov 2 13:37:19 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 13 +++++++++----
.../ovm3/resources/Ovm3StorageProcessor.java | 3 +++
.../src/com/cloud/hypervisor/XenServerGuru.java | 3 +++
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/5] git commit: updated refs/heads/master to 9c90eff
Posted by re...@apache.org.
host delegation logging for XenServerGuru.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c4afb76d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c4afb76d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c4afb76d
Branch: refs/heads/master
Commit: c4afb76d8cce15a67b72e5849ff84e5ff5304b5e
Parents: 6db4b7b
Author: Funs Kessen <fk...@schubergphilis.com>
Authored: Fri Oct 23 20:09:06 2015 +0200
Committer: Funs Kessen <fk...@schubergphilis.com>
Committed: Fri Oct 23 20:09:06 2015 +0200
----------------------------------------------------------------------
.../xenserver/src/com/cloud/hypervisor/XenServerGuru.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4afb76d/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
index f8aabff..9567f31 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
@@ -58,9 +58,11 @@ import com.cloud.vm.UserVmVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.UserVmDao;
+import org.apache.log4j.Logger;
@Local(value = HypervisorGuru.class)
public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru, Configurable {
+ private final Logger LOGGER = Logger.getLogger(XenServerGuru.class);
@Inject
GuestOSDao _guestOsDao;
@Inject
@@ -173,6 +175,7 @@ public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru,
@Override
public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
+ LOGGER.debug("getCommandHostDelegation: " + cmd.getClass());
if (cmd instanceof StorageSubSystemCommand) {
StorageSubSystemCommand c = (StorageSubSystemCommand)cmd;
c.setExecuteInSequence(true);