Apache Solr open-source search software
SOLR-15089: Solidify S3 tests when running with less resources.
Houston Putman919ad85ebe31
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 5f0c796f614..e147adf222d 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@@ -460,7 +460,12 @@ public class S3StorageClient {return true;}- return pathExists(parentDirectory);+ // Check for existence twice, because s3Mock has issues in the tests+ if (pathExists(parentDirectory)) {+ return true;+ } else {+ return pathExists(parentDirectory);+ }}private String getParentDirectory(String path) {@@ -475,7 +480,7 @@ public class S3StorageClient {}return fromEnd > 0? path.substring(0, path.lastIndexOf(S3_FILE_PATH_DELIMITER, fromEnd) + 1)- : S3_FILE_PATH_DELIMITER;+ : "";}/** Ensures path adheres to some rules: -Doesn't start with a leading slash */diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.javaindex b8d4c18a977..a854f911e2e 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java@@ -234,7 +234,7 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {try (BackupRepository repository = cluster.getJettySolrRunner(0).getCoreContainer().newBackupRepository(BACKUP_REPO_NAME)) {String backupLocation = repository.getBackupLocation(getBackupLocation());- URI fullBackupLocationURI = repository.resolve(repository.createURI(backupLocation), backupName, getCollectionName());+ URI fullBackupLocationURI = repository.resolveDirectory(repository.createDirectoryURI(backupLocation), backupName, getCollectionName());BackupFilePaths backupPaths = new BackupFilePaths(repository, fullBackupLocationURI);IncrementalBackupVerifier verifier = new IncrementalBackupVerifier(repository, backupLocation, backupName, getCollectionName(), 3);@@ -448,7 +448,7 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {String backupName, String collection, int maxNumberOfBackupToKeep) {this.repository = repository;this.backupLocation = backupLocation;- this.backupURI = repository.resolve(repository.createURI(backupLocation), backupName, collection);+ this.backupURI = repository.resolveDirectory(repository.createURI(backupLocation), backupName, collection);this.incBackupFiles = new BackupFilePaths(repository, this.backupURI);this.backupName = backupName;this.maxNumberOfBackupToKeep = maxNumberOfBackupToKeep;@@ -536,7 +536,7 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {URI zkBackupFolder = repository.resolve(backupURI, "zk_backup_"+numBackup);assertTrue(repository.exists(backupPropertiesFile));assertTrue(repository.exists(zkBackupFolder));- assertFolderAreSame(repository.resolve(backupURI, BackupFilePaths.getZkStateDir(prevBackupId)), zkBackupFolder);+ assertFolderAreSame(repository.resolveDirectory(backupURI, BackupFilePaths.getZkStateDir(prevBackupId)), zkBackupFolder);// verify indexes filefor(Slice slice : getCollectionState(getCollectionName()).getSlices()) {