Apache Solr open-source search software
SOLR-15702: Fix S3Repository to follow BackupRepository.createDirectory() API contract
Houston Putman174f7c17e978
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 8f54374d59a..df4a92d52c9 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -403,8 +403,7 @@ New FeaturesImprovements-----------------------* SOLR-15702: Stabilize S3 tests by using waiters after directory creation (Houston Putman)+(No changes)Optimizations---------------------@@ -416,6 +415,8 @@ Bug Fixes* SOLR-15691: Admin UI raises yellow warning even when only case of hostnames differ (janhoy)+* SOLR-15702: Fix S3Repository to follow BackupRepository.createDirectory() API contract (Houston Putman)+Build---------------------diff --git a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java b/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.javaindex fd818b78ef2..b6c7c044330 100644--- a/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java+++ b/solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3StorageClient.java@@ -23,7 +23,6 @@ import java.io.InputStream;import java.io.OutputStream;import java.lang.invoke.MethodHandles;import java.net.URI;-import java.time.Duration;import java.util.Collection;import java.util.Comparator;import java.util.HashSet;@@ -38,7 +37,6 @@ import org.slf4j.LoggerFactory;import software.amazon.awssdk.awscore.exception.AwsServiceException;import software.amazon.awssdk.core.exception.SdkClientException;import software.amazon.awssdk.core.exception.SdkException;-import software.amazon.awssdk.core.retry.backoff.BackoffStrategy;import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.http.apache.ApacheHttpClient;import software.amazon.awssdk.http.apache.ProxyConfiguration;@@ -129,36 +127,28 @@ public class S3StorageClient {return clientBuilder.build();}- /** Create a directory in S3. */+ /** Create a directory in S3, if it does not already exist. */void createDirectory(String path) throws S3Exception {String sanitizedDirPath = sanitizedDirPath(path);- if (!parentDirectoryExist(sanitizedDirPath)) {+ // Only create the directory if it does not already exist+ if (!pathExists(sanitizedDirPath)) {createDirectory(getParentDirectory(sanitizedDirPath));// TODO see https://issues.apache.org/jira/browse/SOLR-15359// throw new S3Exception("Parent directory doesn't exist, path=" + path);- }- try {- // Create empty object with content type header- PutObjectRequest putRequest =- PutObjectRequest.builder()- .bucket(bucketName)- .contentType(S3_DIR_CONTENT_TYPE)- .key(sanitizedDirPath)- .build();- s3Client.putObject(putRequest, RequestBody.empty());- // Wait until the object exists to continue- s3Client- .waiter()- .waitUntilObjectExists(- builder -> builder.bucket(bucketName).key(sanitizedDirPath),- config ->- config- .waitTimeout(Duration.ofSeconds(5))- .backoffStrategy(BackoffStrategy.defaultStrategy()));- } catch (SdkClientException ase) {- throw handleAmazonException(ase);+ try {+ // Create empty object with content type header+ PutObjectRequest putRequest =+ PutObjectRequest.builder()+ .bucket(bucketName)+ .contentType(S3_DIR_CONTENT_TYPE)+ .key(sanitizedDirPath)+ .build();+ s3Client.putObject(putRequest, RequestBody.empty());+ } catch (SdkClientException ase) {+ throw handleAmazonException(ase);+ }}}diff --git a/solr/core/src/java/org/apache/solr/core/backup/BackupFilePaths.java b/solr/core/src/java/org/apache/solr/core/backup/BackupFilePaths.javaindex 43b27dc5f6d..d1a54dcb525 100644--- a/solr/core/src/java/org/apache/solr/core/backup/BackupFilePaths.java+++ b/solr/core/src/java/org/apache/solr/core/backup/BackupFilePaths.java@@ -83,18 +83,9 @@ public class BackupFilePaths {* @throws IOException for issues encountered using repository to create directories*/public void createIncrementalBackupFolders() throws IOException {- if (!repository.exists(backupLoc)) {- repository.createDirectory(backupLoc);- }- URI indexDir = getIndexDir();- if (!repository.exists(indexDir)) {- repository.createDirectory(indexDir);- }-- URI shardBackupMetadataDir = getShardBackupMetadataDir();- if (!repository.exists(shardBackupMetadataDir)) {- repository.createDirectory(shardBackupMetadataDir);- }+ repository.createDirectory(backupLoc);+ repository.createDirectory(getIndexDir());+ repository.createDirectory(getShardBackupMetadataDir());}/**