Preserve context in snapshotDeletionListeners (elastic#84089)

DaveCTurner · DaveCTurner · commit 14714536cc11 · 2022-02-17T10:09:47.000Z
Closes elastic#84036
diff --git a/docs/changelog/84089.yaml b/docs/changelog/84089.yaml
@@ -0,0 +1,6 @@
+pr: 84089
+summary: Preserve context in `snapshotDeletionListeners`
+area: Snapshot/Restore
+type: bug
+issues:
+ - 84036
diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
@@ -2286,7 +2286,8 @@ private static boolean isWritingToRepository(SnapshotsInProgress.Entry entry) {
     }
 
     private void addDeleteListener(String deleteUUID, ActionListener<Void> listener) {
-        snapshotDeletionListeners.computeIfAbsent(deleteUUID, k -> new CopyOnWriteArrayList<>()).add(listener);
+        snapshotDeletionListeners.computeIfAbsent(deleteUUID, k -> new CopyOnWriteArrayList<>())
+            .add(ContextPreservingActionListener.wrapPreservingContext(listener, threadPool.getThreadContext()));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2286,7 +2286,8 @@ private static boolean isWritingToRepository(SnapshotsInProgress.Entry entry) {`
`2286`	`2286`	`}`
`2287`	`2287`
`2288`	`2288`	`private void addDeleteListener(String deleteUUID, ActionListener<Void> listener) {`
`2289`		`- snapshotDeletionListeners.computeIfAbsent(deleteUUID, k -> new CopyOnWriteArrayList<>()).add(listener);`
	`2289`	`+ snapshotDeletionListeners.computeIfAbsent(deleteUUID, k -> new CopyOnWriteArrayList<>())`
	`2290`	`+ .add(ContextPreservingActionListener.wrapPreservingContext(listener, threadPool.getThreadContext()));`
`2290`	`2291`	`}`
`2291`	`2292`
`2292`	`2293`	`/**`