From d2ffcf71f2377a22903f01c9161db6e7c9eb5770 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 8 Feb 2022 12:05:06 +0000 Subject: [PATCH 1/2] Fix submit after shutdown --- .../xpack/ml/job/process/ProcessWorkerExecutorService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java index 90773fccdbc9c..43646f5f33616 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java @@ -95,6 +95,7 @@ public synchronized void execute(Runnable command) { EsRejectedExecutionException rejected = new EsRejectedExecutionException(processName + " worker service has shutdown", true); if (command instanceof AbstractRunnable runnable) { runnable.onRejection(rejected); + return; } else { throw rejected; } From 9cd1f7fccf47c6968b4477a179b4fada8833a6f2 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 8 Feb 2022 12:08:07 +0000 Subject: [PATCH 2/2] Update docs/changelog/83645.yaml --- docs/changelog/83645.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docs/changelog/83645.yaml diff --git a/docs/changelog/83645.yaml b/docs/changelog/83645.yaml new file mode 100644 index 0000000000000..8c1dd88c285e6 --- /dev/null +++ b/docs/changelog/83645.yaml @@ -0,0 +1,6 @@ +pr: 83645 +summary: Fix submit after shutdown in process worker service +area: Machine Learning +type: bug +issues: + - 83633