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

koushik-das · koushik-das · commit 1a719afb5161 · 2015-04-29T12:29:21.000+05:30
Using a cached thread pool for VR reboot task
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -405,6 +405,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
     ScheduledExecutorService _checkExecutor;
     ScheduledExecutorService _networkStatsUpdateExecutor;
     ExecutorService _rvrStatusUpdateExecutor;
+    ExecutorService _rebootRouterExecutor;
 
     BlockingQueue<Long> _vrUpdateQueue = null;
 
@@ -571,6 +572,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);
 
@@ -2632,7 +2634,7 @@ public boolean postStateTransitionEvent(final StateMachine2.Transition<State, Vi
                         // 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
`@@ -405,6 +405,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V`
`405`	`405`	`ScheduledExecutorService _checkExecutor;`
`406`	`406`	`ScheduledExecutorService _networkStatsUpdateExecutor;`
`407`	`407`	`ExecutorService _rvrStatusUpdateExecutor;`
	`408`	`+ ExecutorService _rebootRouterExecutor;`
`408`	`409`
`409`	`410`	`BlockingQueue<Long> _vrUpdateQueue = null;`
`410`	`411`
`@@ -571,6 +572,7 @@ public boolean configure(final String name, final Map<String, Object> params) th`
`571`	`572`	`_executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterMonitor"));`
`572`	`573`	`_checkExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterStatusMonitor"));`
`573`	`574`	`_networkStatsUpdateExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("NetworkStatsUpdater"));`
	`575`	`+ _rebootRouterExecutor = Executors.newCachedThreadPool(new NamedThreadFactory("RebootRouterTask"));`
`574`	`576`
`575`	`577`	`VirtualMachine.State.getStateMachine().registerListener(this);`
`576`	`578`
`@@ -2632,7 +2634,7 @@ public boolean postStateTransitionEvent(final StateMachine2.Transition<State, Vi`
`2632`	`2634`	`// 2. If VM is in running state in CS and there is a 'PowerOn' report from new host`
`2633`	`2635`	`if (hostId == null \|\| hostId.longValue() != powerHostId.longValue()) {`
`2634`	`2636`	`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");`
`2635`		`- _executor.schedule(new RebootTask(vo.getId()), 1000, TimeUnit.MICROSECONDS);`
	`2637`	`+ _rebootRouterExecutor.execute(new RebootTask(vo.getId()));`
`2636`	`2638`	`}`
`2637`	`2639`	`}`
`2638`	`2640`	`}`