Compute shardStateId before addAbortListener (#100809) (#100832)

It is not valid to call `SnapshotIndexCommit#indexCommit()` if the snapshot is aborted, so we must compute `shardStateId` before adding the abort listener. Closes #99477
elastic · Oct 13, 2023 · 6507f57 · 6507f57
1 parent c552203
commit 6507f57
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java
@@ -383,6 +383,7 @@ private void snapshot(
             SnapshotIndexCommit snapshotIndexCommit = null;
             try {
                 snapshotIndexCommit = new SnapshotIndexCommit(indexShard.acquireIndexCommitForSnapshot());
+                final var shardStateId = getShardStateId(indexShard, snapshotIndexCommit.indexCommit()); // not aborted so indexCommit() ok
                 snapshotStatus.addAbortListener(makeAbortListener(indexShard.shardId(), snapshot, snapshotIndexCommit));
                 snapshotStatus.ensureNotAborted();
                 repository.snapshotShard(
@@ -392,7 +393,7 @@ private void snapshot(
                         snapshot.getSnapshotId(),
                         indexId,
                         snapshotIndexCommit,
-                        getShardStateId(indexShard, snapshotIndexCommit.indexCommit()),
+                        shardStateId,
                         snapshotStatus,
                         version,
                         entryStartTime,