This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/SOLR-16858 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 2566c6d221e2e7dfccbab9d7bd51e8fb6b80be43 Merge: c5587492b65 c98a8f655ce Author: Chris Hostetter <[email protected]> AuthorDate: Tue Feb 6 14:42:02 2024 -0700 Merge branch 'main' into jira/SOLR-16858 solr/CHANGES.txt | 4 + .../java/org/apache/solr/core/CoreContainer.java | 3 +- .../repository/AbstractBackupRepository.java | 77 ++++++++ .../core/backup/repository/BackupRepository.java | 33 ++++ .../backup/repository/BackupRepositoryFactory.java | 41 +++-- .../repository/DelegatingBackupRepository.java} | 94 +++++----- .../repository/LocalFileSystemRepository.java | 12 +- .../solr/handler/admin/CoreAdminHandler.java | 4 +- .../LocalFSCloudIncrementalBackupTest.java | 2 +- .../repository/LocalFileSystemRepositoryTest.java | 50 ++++++ .../org/apache/solr/gcs/GCSBackupRepository.java | 44 +++-- .../apache/solr/gcs/GCSBackupRepositoryTest.java | 15 +- .../apache/solr/gcs/GCSIncrementalBackupTest.java | 2 +- .../backup/repository/HdfsBackupRepository.java | 11 +- .../HdfsBackupRepositoryIntegrationTest.java | 5 + .../HdfsCloudIncrementalBackupTest.java | 2 +- .../org/apache/solr/s3/S3BackupRepository.java | 24 ++- .../apache/solr/s3/S3BackupRepositoryConfig.java | 10 +- .../org/apache/solr/s3/S3BackupRepositoryTest.java | 5 + .../apache/solr/s3/S3IncrementalBackupTest.java | 2 +- .../deployment-guide/pages/backup-restore.adoc | 15 +- .../org/apache/solr/common/util/ExecutorUtil.java | 9 +- .../collections/AbstractBackupRepositoryTest.java | 194 ++++++++++++++++++++- .../collections/AbstractIncrementalBackupTest.java | 7 +- .../apache/solr/core/TrackingBackupRepository.java | 101 +---------- 25 files changed, 542 insertions(+), 224 deletions(-)
