CLOUDSTACK-8426: Use a separate thread pool for VR reboot in case of out-of-band movement

koushik-das · yadvr · commit 795f3814f69f · 2015-04-29T16:50:40.000+02:00
Using a cached thread pool for VR reboot task (cherry picked from commit 1a719af) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -435,6 +435,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
     ScheduledExecutorService _checkExecutor;
     ScheduledExecutorService _networkStatsUpdateExecutor;
     ExecutorService _rvrStatusUpdateExecutor;
+    ExecutorService _rebootRouterExecutor;
 
     Account _systemAcct;
 
@@ -688,6 +689,7 @@ public boolean configure(final String name, final Map<String, Object> params) th
         _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterMonitor"));
         _checkExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterStatusMonitor"));
         _networkStatsUpdateExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("NetworkStatsUpdater"));
+        _rebootRouterExecutor = Executors.newCachedThreadPool(new NamedThreadFactory("RebootRouterTask"));
 
         VirtualMachine.State.getStateMachine().registerListener(this);
 
@@ -4494,7 +4496,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<State, VirtualM
                         // 2. If VM is in running state in CS and there is a 'PowerOn' report from new host
                         if (hostId == null || (hostId.longValue() != powerHostId.longValue())) {
                             s_logger.info("Schedule a router reboot task as router " + vo.getId() + " is powered-on out-of-band, need to reboot to refresh network rules");
-                            _executor.schedule(new RebootTask(vo.getId()), 1000, TimeUnit.MICROSECONDS);
+                            _rebootRouterExecutor.execute(new RebootTask(vo.getId()));
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V`
`435`	`435`	`ScheduledExecutorService _checkExecutor;`
`436`	`436`	`ScheduledExecutorService _networkStatsUpdateExecutor;`
`437`	`437`	`ExecutorService _rvrStatusUpdateExecutor;`
	`438`	`+ ExecutorService _rebootRouterExecutor;`
`438`	`439`
`439`	`440`	`Account _systemAcct;`
`440`	`441`
`@@ -688,6 +689,7 @@ public boolean configure(final String name, final Map<String, Object> params) th`
`688`	`689`	`_executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterMonitor"));`
`689`	`690`	`_checkExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterStatusMonitor"));`
`690`	`691`	`_networkStatsUpdateExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("NetworkStatsUpdater"));`
	`692`	`+ _rebootRouterExecutor = Executors.newCachedThreadPool(new NamedThreadFactory("RebootRouterTask"));`
`691`	`693`
`692`	`694`	`VirtualMachine.State.getStateMachine().registerListener(this);`
`693`	`695`
`@@ -4494,7 +4496,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<State, VirtualM`
`4494`	`4496`	`// 2. If VM is in running state in CS and there is a 'PowerOn' report from new host`
`4495`	`4497`	`if (hostId == null \|\| (hostId.longValue() != powerHostId.longValue())) {`
`4496`	`4498`	`s_logger.info("Schedule a router reboot task as router " + vo.getId() + " is powered-on out-of-band, need to reboot to refresh network rules");`
`4497`		`- _executor.schedule(new RebootTask(vo.getId()), 1000, TimeUnit.MICROSECONDS);`
	`4499`	`+ _rebootRouterExecutor.execute(new RebootTask(vo.getId()));`
`4498`	`4500`	`}`
`4499`	`4501`	`}`
`4500`	`4502`	`}`