Merge remote-tracking branch 'origin/main' into dev/fix-PemTrustConfigTests-testTrustConfigReloadsFileContents

Author: guojialiang92

server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java

@@ -69,6 +69,7 @@
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.env.Environment;
+import org.opensearch.index.remote.RemoteStoreEnums;
 import org.opensearch.index.seqno.RetentionLeaseActions;
 import org.opensearch.index.seqno.RetentionLeases;
 import org.opensearch.indices.recovery.PeerRecoveryTargetService;
@@ -450,7 +451,12 @@ public void testSnapshotWithStuckNode() throws Exception {
         createRepository(
             "test-repo",
             "mock",
-            Settings.builder().put("location", repo).put("random", randomAlphaOfLength(10)).put("wait_after_unblock", 200)
+            Settings.builder()
+                .put("location", repo)
+                .put("random", randomAlphaOfLength(10))
+                .put("wait_after_unblock", 200)
+                // TODO: There's likely a bug with other path types where cleanup seems to leave unexpected files
+                .put(BlobStoreRepository.SHARD_PATH_TYPE.getKey(), RemoteStoreEnums.PathType.FIXED)
         );
 
         // Pick one node and block it

test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java

@@ -2674,7 +2674,7 @@ public static PutRepositoryRequestBuilder putRepositoryRequestBuilder(
         if (timeout != null) {
             builder.setTimeout(timeout);
         }
-        if (finalSettings == false) {
+        if (finalSettings == false && settings.keys().contains(BlobStoreRepository.SHARD_PATH_TYPE.getKey()) == false) {
             settings.put(BlobStoreRepository.SHARD_PATH_TYPE.getKey(), randomFrom(PathType.values()));
         }
         builder.setSettings(settings);