Repository: cloudstack
Updated Branches:
refs/heads/4.4 8b4b51b05 -> 291a34aac
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 <rohit.ya...@shapeblue.com>
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/291a34aa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/291a34aa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/291a34aa
Branch: refs/heads/4.4
Commit: 291a34aac17ef0c61727379fca0094dfff22c1ee
Parents: 8b4b51b
Author: Koushik Das <kous...@apache.org>
Authored: Mon Dec 1 16:18:06 2014 +0530
Committer: Rohit Yadav <rohit.ya...@shapeblue.com>
Committed: Tue Dec 2 15:48:44 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 18 +++++++++++++++---
.../VpcVirtualNetworkApplianceManagerImpl.java | 7 +++++++
2 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/291a34aa/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 234909b..e66fcfb 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4402,10 +4402,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/291a34aa/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 c7d4d4c..baf1d0c 100644
---
a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -1484,4 +1484,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;
+ }
}
