You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/03/08 01:22:59 UTC
[26/50] [abbrv] git commit: updated refs/heads/resize-root to 0eb9967
Use seperate path to sync VM metadata for XS
VM status sync only does VM status sync
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad88bbb6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad88bbb6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad88bbb6
Branch: refs/heads/resize-root
Commit: ad88bbb684e9d213c7ec3a3ed75cad98561fd6e0
Parents: ab1d3af
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Mar 5 15:44:31 2014 -0800
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed Mar 5 15:44:50 2014 -0800
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad88bbb6/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 7b98f5d..c13cde7 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3027,11 +3027,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
@Override
public boolean processAnswers(long agentId, long seq, Answer[] answers) {
- if (!VmJobEnabled.value()) {
- for (final Answer answer : answers) {
- if (answer instanceof ClusterSyncAnswer) {
+ for (final Answer answer : answers) {
+ if (answer instanceof ClusterSyncAnswer) {
+ if (!VmJobEnabled.value()) {
ClusterSyncAnswer hs = (ClusterSyncAnswer)answer;
- if (!hs.isExceuted()) {
+ if (!hs.isExecuted()) {
deltaSync(hs.getNewStates());
hs.setExecuted();
}
@@ -3129,7 +3129,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (agent.getHypervisorType() == HypervisorType.XenServer) { // only for Xen
if (!VmJobEnabled.value()) {
StartupRoutingCommand startup = (StartupRoutingCommand)cmd;
- HashMap<String, Ternary<String, State, String>> allStates = startup.getClusterVMStateChanges();
+ HashMap<String, Pair<String, State>> allStates = startup.getClusterVMStateChanges();
if (allStates != null) {
fullSync(clusterId, allStates);
}