From f0971e50be1c27fa9f8b45e8274dc7fbde55be39 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Tue, 31 Oct 2017 16:00:27 +0100 Subject: [PATCH] SONAR-10026 Avoid submitting callback tasks to the executor --- .../org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java | 4 ++-- .../sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java index 6dec30bfdc8..12b376398fc 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java @@ -65,7 +65,7 @@ public class CeProcessingSchedulerImpl implements CeProcessingScheduler { public void startScheduling() { for (ChainingCallback chainingCallback : chainingCallbacks) { ListenableScheduledFuture future = executorService.schedule(chainingCallback.worker, delayBetweenEnabledTasks, timeUnit); - addCallback(future, chainingCallback, executorService); + addCallback(future, chainingCallback); } } @@ -165,7 +165,7 @@ public class CeProcessingSchedulerImpl implements CeProcessingScheduler { private void addCallback() { if (workerFuture != null && keepRunning()) { - Futures.addCallback(workerFuture, this, executorService); + Futures.addCallback(workerFuture, this); } } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java index e98fa826962..710ec5b0e87 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java @@ -230,7 +230,7 @@ public class CeProcessingSchedulerImplTest { for (int i = 0; i < workerCount; i++) { verify(processingExecutorService).schedule(workers[i], ceConfiguration.getQueuePollingDelay(), MILLISECONDS); } - verify(listenableScheduledFuture, times(workerCount)).addListener(any(Runnable.class), eq(processingExecutorService)); + verify(listenableScheduledFuture, times(workerCount)).addListener(any(Runnable.class), eq(MoreExecutors.directExecutor())); for (int i = 0; i < workerCount; i++) { verify(ceWorkerFactory).create(i); } -- 2.39.5