You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/01/27 15:46:18 UTC

[1/2] git commit: updated refs/heads/master to c07c850

Repository: cloudstack
Updated Branches:
  refs/heads/master 06fe7844d -> c07c850df


CLOUDSTACK-9185: [VMware DRS] VM sync failed with exception due to out-of-band changes

Summary: The target "ClusteredVirtualMachineManagerImpl.HandlePowerStateReport" invoked during the VM power state sync is not found as HandlePowerStateReport was not implemented in ClusteredVirtualMachineManagerImpl and was private in VirtualMachineManagerImpl, which was resulting in InvocationTargetException. Changed HandlePowerStateReport() in VirtualMachineManagerImpl to protected.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2d5f6a79
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d5f6a79
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d5f6a79

Branch: refs/heads/master
Commit: 2d5f6a7911585a8075996e106f97b7f3b89067f8
Parents: 94a1448
Author: Suresh Kumar Anaparti <su...@citrix.com>
Authored: Thu Dec 17 10:59:31 2015 +0530
Committer: Suresh Kumar Anaparti <su...@citrix.com>
Committed: Thu Dec 17 10:59:38 2015 +0530

----------------------------------------------------------------------
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d5f6a79/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 5c58389..1ed0249 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3685,7 +3685,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     //
 
     @MessageHandler(topic = Topics.VM_POWER_STATE)
-    private void HandlePowerStateReport(final String subject, final String senderAddress, final Object args) {
+    protected void HandlePowerStateReport(final String subject, final String senderAddress, final Object args) {
         assert args != null;
         final Long vmId = (Long)args;
 


[2/2] git commit: updated refs/heads/master to c07c850

Posted by bh...@apache.org.
Merge pull request #1256 from sureshanaparti/CLOUDSTACK-9185

CLOUDSTACK-9185: [VMware DRS] VM sync failed with exception due to out-of-band changesSummary: The target "ClusteredVirtualMachineManagerImpl.HandlePowerStateReport" invoked during the VM power state sync is not found as HandlePowerStateReport was not implemented in ClusteredVirtualMachineManagerImpl and was private in VirtualMachineManagerImpl, which was resulting in InvocationTargetException. Changed HandlePowerStateReport() in VirtualMachineManagerImpl to protected.

* pr/1256:
  CLOUDSTACK-9185: [VMware DRS] VM sync failed with exception due to out-of-band changes

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c07c850d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c07c850d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c07c850d

Branch: refs/heads/master
Commit: c07c850dff913c38b72ca35b34b1b0fc9fc423cb
Parents: 06fe784 2d5f6a7
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 15:45:54 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 27 15:45:54 2016 +0100

----------------------------------------------------------------------
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c07c850d/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------