fix(core): run CancellableStage cancel method on dedicated thread pool (

#3164)
spinnaker · Sep 17, 2019 · efe1163 · efe1163
1 parent d671314
commit efe1163
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java
@@ -173,6 +173,16 @@ public ThreadPoolTaskExecutor applicationEventTaskExecutor() {
     return threadPool;
   }
 
+  @Bean
+  public ThreadPoolTaskExecutor cancellableStageExecutor() {
+    ThreadPoolTaskExecutor threadPool = new ThreadPoolTaskExecutor();
+    threadPool.setThreadNamePrefix("cancel-");
+    threadPool.setCorePoolSize(5);
+    threadPool.setMaxPoolSize(10);
+    threadPool.setQueueCapacity(20);
+    return threadPool;
+  }
+
   @Bean
   public TaskScheduler taskScheduler() {
     ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();

diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/handler/CancelStageHandler.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/handler/CancelStageHandler.kt
@@ -38,7 +38,7 @@ class CancelStageHandler(
   override val stageDefinitionBuilderFactory: StageDefinitionBuilderFactory,
   override val stageNavigator: StageNavigator,
 
-  @Qualifier("messageHandlerPool") private val executor: Executor,
+  @Qualifier("cancellableStageExecutor") private val executor: Executor,
   private val taskResolver: TaskResolver
 ) : OrcaMessageHandler<CancelStage>, StageBuilderAware, AuthenticationAware {