From b22eae5fa70b05bc5c40807cbbab02047357d2ac Mon Sep 17 00:00:00 2001
From: Volodymyr Krasnikov <129072588+volodk85@users.noreply.github.com>
Date: Wed, 1 Nov 2023 07:34:32 -0700
Subject: [PATCH] Fix race condition in SnapshotsService (#101652)

* Fix race condition in SnapshotsService

* Update docs/changelog/101652.yaml
---
 docs/changelog/101652.yaml                                   | 5 +++++
 .../org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java   | 1 -
 .../java/org/elasticsearch/snapshots/SnapshotsService.java   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 docs/changelog/101652.yaml

diff --git a/docs/changelog/101652.yaml b/docs/changelog/101652.yaml
new file mode 100644
index 000000000000..79e3167696ae
--- /dev/null
+++ b/docs/changelog/101652.yaml
@@ -0,0 +1,5 @@
+pr: 101652
+summary: Fix race condition in `SnapshotsService`
+area: Snapshot/Restore
+type: bug
+issues: []
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
index d68301a31072..ca522064e3d0 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
@@ -1066,7 +1066,6 @@ public class ConcurrentSnapshotsIT extends AbstractSnapshotIntegTestCase {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99355")
     public void testMasterFailoverOnFinalizationLoop() throws Exception {
         internalCluster().startMasterOnlyNodes(3);
         final String dataNode = internalCluster().startDataOnlyNode();
diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
index 3317efd7675b..8a15572c3e7f 100644
--- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
+++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
@@ -164,7 +164,7 @@ public class SnapshotsService extends AbstractLifecycleComponent implements Clus
     /**
      * Listeners for snapshot deletion keyed by delete uuid as returned from {@link SnapshotDeletionsInProgress.Entry#uuid()}
      */
-    private final Map<String, List<ActionListener<Void>>> snapshotDeletionListeners = new HashMap<>();
+    private final Map<String, List<ActionListener<Void>>> snapshotDeletionListeners = new ConcurrentHashMap<>();
 
     // Set of repositories currently running either a snapshot finalization or a snapshot delete.
     private final Set<String> currentlyFinalizing = Collections.synchronizedSet(new HashSet<>());