Determine pinned timestamp just before we need it

Signed-off-by: Gaurav Bafna <[email protected]>
gbbafna · Oct 10, 2024 · 7f9d8a6 · 7f9d8a6
1 parent 58adc18
commit 7f9d8a6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
@@ -128,6 +128,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -466,7 +467,7 @@ public TimeValue timeout() {
      * @param listener snapshot creation listener
      */
     public void createSnapshotV2(final CreateSnapshotRequest request, final ActionListener<SnapshotInfo> listener) {
-        long pinnedTimestamp = System.currentTimeMillis();
+        AtomicLong pinnedTimestamp = new AtomicLong();
         final String repositoryName = request.repository();
         final String snapshotName = indexNameExpressionResolver.resolveDateMathExpression(request.snapshot());
 
@@ -578,19 +579,20 @@ public void clusterStateProcessed(String source, ClusterState oldState, final Cl
                     request.indicesOptions(),
                     request.indices()
                 );
+                pinnedTimestamp.set(System.currentTimeMillis());
                 final SnapshotInfo snapshotInfo = new SnapshotInfo(
                     snapshotId,
                     shardGenerations.indices().stream().map(IndexId::getName).collect(Collectors.toList()),
                     newEntry.dataStreams(),
-                    pinnedTimestamp,
+                    pinnedTimestamp.get(),
                     null,
                     System.currentTimeMillis(),
                     shardGenerations.totalShards(),
                     Collections.emptyList(),
                     request.includeGlobalState(),
                     newEntry.userMetadata(),
                     true,
-                    pinnedTimestamp
+                    pinnedTimestamp.get()
                 );
                 final Version version = minCompatibleVersion(newState.nodes().getMinNodeVersion(), repositoryData, null);
                 final StepListener<RepositoryData> pinnedTimestampListener = new StepListener<>();
@@ -645,7 +647,7 @@ public void onFailure(Exception e) {
                     stateWithoutSnapshotV2(newState);
                     listener.onFailure(e);
                 });
-                updateSnapshotPinnedTimestamp(repositoryData, snapshot, pinnedTimestamp, pinnedTimestampListener);
+                updateSnapshotPinnedTimestamp(repositoryData, snapshot, pinnedTimestamp.get(), pinnedTimestampListener);
             }
 
             @Override