Disable remote integrity check for encrypted repos for ChecksumBlobst…

…oreFormat (opensearch-project#9908) (opensearch-project#9923) (cherry picked from commit 967ef31) Signed-off-by: bansvaru <bansvaru@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
austintlee · Sep 8, 2023 · e47a94a · e47a94a
1 parent 5258ff2
commit e47a94a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/ChecksumBlobStoreFormat.java b/server/src/main/java/org/opensearch/repositories/blobstore/ChecksumBlobStoreFormat.java
@@ -222,7 +222,7 @@ public void writeAsync(
                     WritePriority.HIGH,
                     (size, position) -> new OffsetRangeIndexInputStream(input, size, position),
                     expectedChecksum,
-                    true
+                    ((AsyncMultiStreamBlobContainer) blobContainer).remoteIntegrityCheckSupported()
                 )
             ) {
                 ((AsyncMultiStreamBlobContainer) blobContainer).asyncBlobUpload(remoteTransferContainer.createWriteContext(), listener);

diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
@@ -244,7 +244,11 @@ public void testWriteFullMetadataInParallelSuccess() throws IOException {
         assertEquals(writtenIndexMetadata.getIndex().getName(), "test-index");
         assertEquals(writtenIndexMetadata.getIndex().getUUID(), "index-uuid");
         long expectedChecksum = RemoteTransferContainer.checksumOfChecksum(new ByteArrayIndexInput("metadata-filename", writtenBytes), 8);
-        assertEquals(capturedWriteContext.getExpectedChecksum().longValue(), expectedChecksum);
+        if (capturedWriteContext.doRemoteDataIntegrityCheck()) {
+            assertEquals(capturedWriteContext.getExpectedChecksum().longValue(), expectedChecksum);
+        } else {
+            assertEquals(capturedWriteContext.getExpectedChecksum(), null);
+        }
 
     }