CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
(cherry picked from commit 513adab51b53ba1acdea908225cfffab90ca1595) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a91aa9a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a91aa9a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a91aa9a Branch: refs/heads/4.3 Commit: 8a91aa9afa8f58266393c7c9949893ca4ce18fb7 Parents: b2c2402 Author: Koushik Das <[email protected]> Authored: Mon Dec 1 16:18:06 2014 +0530 Committer: Rohit Yadav <[email protected]> Committed: Tue Dec 2 15:35:48 2014 +0530 ---------------------------------------------------------------------- .../VirtualNetworkApplianceManagerImpl.java | 20 +++++++++++++++----- .../VpcVirtualNetworkApplianceManagerImpl.java | 7 +++++++ 2 files changed, 22 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a91aa9a/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 f625b11..e62852a 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -46,7 +46,6 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.apache.cloudstack.alert.AlertService; -import org.apache.cloudstack.alert.AlertService.AlertType; import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd; import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd; @@ -61,7 +60,6 @@ import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.cloudstack.utils.usage.UsageUtils; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -4312,10 +4310,22 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V @Override public boolean postStateTransitionEvent(State oldState, VirtualMachine.Event event, State newState, VirtualMachine vo, boolean status, Object opaque) { - 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); + if (opaque != null && opaque instanceof Pair<?, ?>) { + Pair<?, ?> pair = (Pair<?, ?>)opaque; + Object first = pair.first(); + Object second = pair.second(); + if (first != null && second != null && first instanceof Long && second instanceof Long) { + Long hostId = (Long)first; + Long powerHostId = (Long)second; + // If VM host known to CS is different from 'PowerOn' report host, then it is out-of-band movement + if (hostId.longValue() != powerHostId.longValue()) { + 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); + } + } + } } } return true; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a91aa9a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 033d52c..d9933b2 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -1521,4 +1521,11 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian return true; } + + @Override + public boolean postStateTransitionEvent(State oldState, VirtualMachine.Event event, State newState, VirtualMachine vo, boolean status, Object opaque) { + // Without this VirtualNetworkApplianceManagerImpl.postStateTransitionEvent() gets called twice as part of listeners - + // once from VpcVirtualNetworkApplianceManagerImpl and once from VirtualNetworkApplianceManagerImpl itself + return true; + } }
