fix(core): disambiguate task executor beans so Spring Batch doesn't r…

…un single-threaded
spinnaker · May 1, 2017 · 2b1aaaa · 2b1aaaa
1 parent 4900264
commit 2b1aaaa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/config/QueueConfiguration.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/config/QueueConfiguration.kt
@@ -21,6 +21,7 @@ import com.netflix.spinnaker.orca.q.ExecutionLogRepository
 import com.netflix.spinnaker.orca.q.Queue
 import com.netflix.spinnaker.orca.q.handler.DeadMessageHandler
 import com.netflix.spinnaker.orca.q.memory.InMemoryQueue
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
@@ -54,11 +55,13 @@ open class QueueConfiguration {
    * a long time to do stuff do not affect the processing of the queue.
    */
   @Bean
-  open fun applicationEventMulticaster(taskExecutor: ThreadPoolTaskExecutor): ApplicationEventMulticaster =
+  open fun applicationEventMulticaster(
+    @Qualifier("applicationEventTaskExecutor") taskExecutor: ThreadPoolTaskExecutor
+  ): ApplicationEventMulticaster =
     SimpleApplicationEventMulticaster().apply {
       setTaskExecutor(taskExecutor)
       // TODO: should set an error handler as well
     }
 
-  @Bean open fun taskExecutor(): ThreadPoolTaskExecutor = ThreadPoolTaskExecutor()
+  @Bean open fun applicationEventTaskExecutor(): ThreadPoolTaskExecutor = ThreadPoolTaskExecutor()
 }
diff --git a/orca-spring-batch/src/main/groovy/com/netflix/spinnaker/config/SpringBatchConfiguration.java b/orca-spring-batch/src/main/groovy/com/netflix/spinnaker/config/SpringBatchConfiguration.java
@@ -39,6 +39,7 @@
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.launch.support.SimpleJobOperator;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -79,8 +80,7 @@ ExecutionRunner springBatchExecutionRunner(Collection<StageDefinitionBuilder> st
     );
   }
 
-  @Bean
-  @ConditionalOnMissingBean(TaskExecutor.class)
+  @Bean(name = "springBatchTaskExecutor")
   TaskExecutor getTaskExecutor(Registry registry) {
     ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
     executor.setMaxPoolSize(150);
@@ -91,7 +91,9 @@ TaskExecutor getTaskExecutor(Registry registry) {
 
   @Bean
   @ConditionalOnMissingBean(BatchConfigurer.class)
-  BatchConfigurer batchConfigurer(TaskExecutor taskExecutor) {
+  BatchConfigurer batchConfigurer(
+    @Qualifier("springBatchTaskExecutor") TaskExecutor taskExecutor
+  ) {
     return new MultiThreadedBatchConfigurer(taskExecutor);
   }