Fix memory leak in TransportDeleteExpiredDataAction (#89935) (#89945)

We can loose the listener here because the downstream code in `deleteExpiredData` might throw.
elastic · Sep 8, 2022 · 5fcb0bc · 5fcb0bc
1 parent ffc9ff1
commit 5fcb0bc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/docs/changelog/89935.yaml b/docs/changelog/89935.yaml
@@ -0,0 +1,5 @@
+pr: 89935
+summary: Fix memory leak in `TransportDeleteExpiredDataAction`
+area: Machine Learning
+type: bug
+issues: []
diff --git a/.../ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteExpiredDataAction.java b/.../ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteExpiredDataAction.java
@@ -9,6 +9,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionRunnable;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.action.support.ThreadedActionListener;
@@ -137,17 +138,25 @@ protected void doExecute(
         if (Strings.isNullOrEmpty(request.getJobId()) || Strings.isAllOrWildcard(request.getJobId())) {
             List<MlDataRemover> dataRemovers = createDataRemovers(client, taskId, anomalyDetectionAuditor);
             threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME)
-                .execute(() -> deleteExpiredData(request, dataRemovers, listener, isTimedOutSupplier));
+                .execute(ActionRunnable.wrap(listener, l -> deleteExpiredData(request, dataRemovers, l, isTimedOutSupplier)));
         } else {
-            jobConfigProvider.expandJobs(request.getJobId(), false, true, null, ActionListener.wrap(jobBuilders -> {
-                threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME).execute(() -> {
-                    List<Job> jobs = jobBuilders.stream().map(Job.Builder::build).collect(Collectors.toList());
-                    String[] jobIds = jobs.stream().map(Job::getId).toArray(String[]::new);
-                    request.setExpandedJobIds(jobIds);
-                    List<MlDataRemover> dataRemovers = createDataRemovers(jobs, taskId, anomalyDetectionAuditor);
-                    deleteExpiredData(request, dataRemovers, listener, isTimedOutSupplier);
-                });
-            }, listener::onFailure));
+            jobConfigProvider.expandJobs(
+                request.getJobId(),
+                false,
+                true,
+                null,
+                ActionListener.wrap(
+                    jobBuilders -> threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME)
+                        .execute(ActionRunnable.wrap(listener, l -> {
+                            List<Job> jobs = jobBuilders.stream().map(Job.Builder::build).collect(Collectors.toList());
+                            String[] jobIds = jobs.stream().map(Job::getId).toArray(String[]::new);
+                            request.setExpandedJobIds(jobIds);
+                            List<MlDataRemover> dataRemovers = createDataRemovers(jobs, taskId, anomalyDetectionAuditor);
+                            deleteExpiredData(request, dataRemovers, l, isTimedOutSupplier);
+                        })),
+                    listener::onFailure
+                )
+            );
         }
     }