You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ni...@apache.org on 2014/11/14 23:35:28 UTC

git commit: updated refs/heads/master to 39a671d

Repository: cloudstack
Updated Branches:
  refs/heads/master 2d4e87973 -> 39a671dfd


CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured.


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

Branch: refs/heads/master
Commit: 39a671dfd889148d69d2f75285d194a4705c35cc
Parents: 2d4e879
Author: Nitin Mehta <ni...@citrix.com>
Authored: Fri Nov 14 14:30:37 2014 -0800
Committer: Nitin Mehta <ni...@citrix.com>
Committed: Fri Nov 14 14:30:46 2014 -0800

----------------------------------------------------------------------
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/39a671df/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 315bdde..4db590b 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2577,7 +2577,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
         final State oldState = transition.getCurrentState();
         final State newState = transition.getToState();
         final VirtualMachine.Event event = transition.getEvent();
-        if (oldState == State.Stopped && event == VirtualMachine.Event.FollowAgentPowerOnReport && newState == State.Running) {
+        if (event == VirtualMachine.Event.FollowAgentPowerOnReport && newState == State.Running) {
             if (vo.getType() == VirtualMachine.Type.DomainRouter) {
                 s_logger.info("Schedule a router reboot task as router " + vo.getId() + " is powered-on out-of-band. we need to reboot to refresh network rules");
                 _executor.schedule(new RebootTask(vo.getId()), 1000, TimeUnit.MICROSECONDS);