Fix deserilization error

Signed-off-by: Anshu Agarwal <[email protected]>
opensearch-project · Aug 6, 2024 · d9bbc65 · d9bbc65
1 parent 9142a25
commit d9bbc65
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotInfo.java b/server/src/main/java/org/opensearch/snapshots/SnapshotInfo.java
@@ -125,7 +125,7 @@ public static final class SnapshotInfoBuilder {
         private Boolean includeGlobalState = null;
 
         private Boolean remoteStoreIndexShallowCopy = null;
-        private long pinnedTimestamp;
+        private long pinnedTimestamp = 0L;
         private Map<String, Object> userMetadata = null;
         private int version = -1;
         private List<SnapshotShardFailure> shardFailures = null;
@@ -351,7 +351,7 @@ public SnapshotInfo(SnapshotsInProgress.Entry entry) {
             entry.includeGlobalState(),
             entry.userMetadata(),
             entry.remoteStoreIndexShallowCopy(),
-            0
+            0L
         );
     }
 
@@ -443,7 +443,7 @@ public SnapshotInfo(final StreamInput in) throws IOException {
             remoteStoreIndexShallowCopy = in.readOptionalBoolean();
         }
         if (in.getVersion().onOrAfter(Version.V_2_16_0)) {
-            pinnedTimestamp = in.readLong();
+            pinnedTimestamp = in.readVLong();
         }
     }
 
@@ -667,9 +667,8 @@ public XContentBuilder toXContent(final XContentBuilder builder, final Params pa
         if (remoteStoreIndexShallowCopy != null) {
             builder.field(REMOTE_STORE_INDEX_SHALLOW_COPY, remoteStoreIndexShallowCopy);
         }
-        if (pinnedTimestamp != 0) {
-            builder.field(PINNED_TIMESTAMP);
-        }
+        builder.field(PINNED_TIMESTAMP);
+
         builder.startArray(INDICES);
         for (String index : indices) {
             builder.value(index);

diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
@@ -300,7 +300,6 @@ public void startCreateSnapshot(final CreateSnapshotRequest request, final Actio
      * @param listener snapshot creation listener
      */
     public void createSnapshot(final CreateSnapshotRequest request, final ActionListener<Snapshot> listener) {
-
         final String repositoryName = request.repository();
         final String snapshotName = indexNameExpressionResolver.resolveDateMathExpression(request.snapshot());
         validate(repositoryName, snapshotName);
@@ -518,7 +517,7 @@ public void createShallowSnapshotV2(final CreateSnapshotRequest request, final A
                     shardGenerations.indices().stream().map(IndexId::getName).collect(Collectors.toList()),
                     dataStreams,
                     pinnedTimestamp,
-                    "",
+                    null,
                     System.currentTimeMillis(),
                     shardGenerations.totalShards(),
                     Collections.emptyList(),
@@ -532,10 +531,14 @@ public void createShallowSnapshotV2(final CreateSnapshotRequest request, final A
                 }
                 final StepListener<RepositoryData> pinnedTimestampListener = new StepListener<>();
                 pinnedTimestampListener.whenComplete(
-                    repoData -> completeListenersIgnoringException(
+
+                        repoData -> {completeListenersIgnoringException(
                         endAndGetListenersToResolve(snapshot),
                         Tuple.tuple(repoData, snapshotInfo)
-                    ),
+                    );
+                    listener.onResponse(snapshot);
+                    },
+
                     e -> failSnapshotCompletionListeners(snapshot, new SnapshotException(snapshot, e.toString()))
                 );
 
@@ -545,7 +548,7 @@ public void createShallowSnapshotV2(final CreateSnapshotRequest request, final A
                     metadataForSnapshot(currentState.metadata(), request.includeGlobalState(), false, dataStreams, indexIds),
                     snapshotInfo,
                     version,
-                    (Function<ClusterState, ClusterState>) currentState,
+                    state -> stateWithoutSnapshot(clusterService.state(), snapshot),
                     new ActionListener<RepositoryData>() {
                         @Override
                         public void onResponse(RepositoryData repositoryData) {
@@ -583,6 +586,7 @@ private void updateSnapshotPinnedTimestamp(
         long timestampToPin,
         ActionListener<RepositoryData> listener
     ) {
+        listener.onResponse(repositoryData);
         // remoteStorePinnedTimestampService.pinTimestamp(
         // timestampToPin,
         // snapshot.getRepository() + "__" + snapshot.getSnapshotId(),

diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java
@@ -256,7 +256,7 @@ protected SnapshotInfo mutateInstance(SnapshotInfo instance) {
                     instance.includeGlobalState(),
                     instance.userMetadata(),
                     instance.isRemoteStoreIndexShallowCopyEnabled(),
-                    0
+                    123456
                 );
             case 9:
                 return new SnapshotInfo(
@@ -271,7 +271,7 @@ protected SnapshotInfo mutateInstance(SnapshotInfo instance) {
                     instance.includeGlobalState(),
                     instance.userMetadata(),
                     Boolean.FALSE.equals(instance.isRemoteStoreIndexShallowCopyEnabled()),
-                    0
+                    123456
                 );
             default:
                 throw new IllegalArgumentException("invalid randomization case");