You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2024/02/06 22:24:11 UTC
(solr) branch jira/SOLR-16858 updated (c5587492b65 -> 2566c6d221e)
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a change to branch jira/SOLR-16858
in repository https://gitbox.apache.org/repos/asf/solr.git
from c5587492b65 Merge remote-tracking branch 'origin/main' into jira/SOLR-16858
add fa8149564cc SOLR-17146: Add DelegatingBackupRepository and alternative checksum verification (#2239)
add c98a8f655ce SOLR-17149: Fix backup/restore for large collections. (#2243)
new 2566c6d221e Merge branch 'main' into jira/SOLR-16858
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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} | 45 ++---
.../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, 515 insertions(+), 246 deletions(-)
create mode 100644 solr/core/src/java/org/apache/solr/core/backup/repository/AbstractBackupRepository.java
copy solr/{test-framework/src/java/org/apache/solr/core/TrackingBackupRepository.java => core/src/java/org/apache/solr/core/backup/repository/DelegatingBackupRepository.java} (67%)
copy solr/core/src/test/org/apache/solr/{search/join/ShardJoinRouterTest.java => core/backup/repository/LocalFileSystemRepositoryTest.java} (52%)
(solr) 01/01: Merge branch 'main' into jira/SOLR-16858
Posted by ho...@apache.org.
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 <ho...@apache.org>
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(-)