Take into account base_path setting during repository analysis execution. (#69690)

Relates #67247

Author: fcofdez

x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalysisSuccessIT.java

@@ -17,6 +17,7 @@
 import org.elasticsearch.common.blobstore.DeleteResult;
 import org.elasticsearch.common.blobstore.support.PlainBlobMetadata;
 import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.BigArrays;
@@ -49,13 +50,16 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
 
 public class RepositoryAnalysisSuccessIT extends AbstractSnapshotIntegTestCase {
 
+    private static final String BASE_PATH_SETTING_KEY = "base_path";
+
     @Before
     public void suppressConsistencyChecks() {
         disableRepoConsistencyCheck("repository is not used for snapshots");
@@ -68,9 +72,16 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
 
     public void testRepositoryAnalysis() {
 
-        createRepositoryNoVerify("test-repo", TestPlugin.ASSERTING_REPO_TYPE);
+        final Settings.Builder settings = Settings.builder();
+        if (randomBoolean()) {
+            settings.put(BASE_PATH_SETTING_KEY, randomAlphaOfLength(10));
+        }
 
-        final AssertingBlobStore blobStore = new AssertingBlobStore();
+        assertAcked(
+            clusterAdmin().preparePutRepository("test-repo").setVerify(false).setType(TestPlugin.ASSERTING_REPO_TYPE).setSettings(settings)
+        );
+
+        final AssertingBlobStore blobStore = new AssertingBlobStore(settings.get(BASE_PATH_SETTING_KEY));
         for (final RepositoriesService repositoriesService : internalCluster().getInstances(RepositoriesService.class)) {
             try {
                 ((AssertingRepository) repositoriesService.repository("test-repo")).setBlobStore(blobStore);
@@ -133,12 +144,21 @@ public Map<String, Repository.Factory> getRepositories(
                     clusterService,
                     bigArrays,
                     recoverySettings,
-                    new BlobPath()
+                    buildBlobPath(metadata.settings())
                 )
             );
         }
     }
 
+    private static BlobPath buildBlobPath(Settings settings) {
+        final String basePath = settings.get(BASE_PATH_SETTING_KEY);
+        if (basePath == null) {
+            return BlobPath.cleanPath();
+        } else {
+            return BlobPath.cleanPath().add(basePath);
+        }
+    }
+
     static class AssertingRepository extends BlobStoreRepository {
 
         private final AtomicReference<BlobStore> blobStoreRef = new AtomicReference<>();
@@ -167,6 +187,7 @@ protected BlobStore createBlobStore() {
     }
 
     static class AssertingBlobStore implements BlobStore {
+        private final String pathPrefix;
 
         @Nullable // if no current blob container
         private String currentPath;
@@ -179,9 +200,13 @@ static class AssertingBlobStore implements BlobStore {
         private long maxBlobSize = new RepositoryAnalyzeAction.Request("dummy").getMaxBlobSize().getBytes();
         private long maxTotalBlobSize = new RepositoryAnalyzeAction.Request("dummy").getMaxTotalDataSize().getBytes();
 
+        AssertingBlobStore(@Nullable String basePath) {
+            this.pathPrefix = basePath == null ? "" : basePath + "/";
+        }
+
         @Override
         public BlobContainer blobContainer(BlobPath path) {
-            assertThat(path.buildAsString(), startsWith("temp-analysis-"));
+            assertThat(path.buildAsString(), startsWith(pathPrefix + "temp-analysis-"));
 
             synchronized (this) {
                 if (currentPath == null) {

x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java

@@ -178,7 +178,8 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
                 throw new IllegalArgumentException("repository [" + request.getRepositoryName() + "] is read-only");
             }
             final BlobStoreRepository blobStoreRepository = (BlobStoreRepository) repository;
-            final BlobContainer blobContainer = blobStoreRepository.blobStore().blobContainer(new BlobPath().add(request.blobPath));
+            final BlobPath path = blobStoreRepository.basePath().add(request.blobPath);
+            final BlobContainer blobContainer = blobStoreRepository.blobStore().blobContainer(path);
 
             logger.trace("handling [{}]", request);
 

x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/GetBlobChecksumAction.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.common.blobstore.BlobContainer;
-import org.elasticsearch.common.blobstore.BlobPath;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -85,7 +84,8 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
             }
 
             final BlobStoreRepository blobStoreRepository = (BlobStoreRepository) repository;
-            final BlobContainer blobContainer = blobStoreRepository.blobStore().blobContainer(new BlobPath().add(request.getBlobPath()));
+            final BlobContainer blobContainer = blobStoreRepository.blobStore()
+                .blobContainer(blobStoreRepository.basePath().add(request.getBlobPath()));
 
             logger.trace("handling [{}]", request);
 

x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalyzeAction.java

@@ -29,7 +29,6 @@
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.blobstore.BlobContainer;
 import org.elasticsearch.common.blobstore.BlobMetadata;
-import org.elasticsearch.common.blobstore.BlobPath;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -525,7 +524,7 @@ public BlobAnalyzeAction.Response read(StreamInput in) throws IOException {
         }
 
         private BlobContainer getBlobContainer() {
-            return repository.blobStore().blobContainer(new BlobPath().add(blobPath));
+            return repository.blobStore().blobContainer(repository.basePath().add(blobPath));
         }
 
         private void onWorkerCompletion() {