You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/09/02 12:15:33 UTC
[2/2] lucene-solr:master: SOLR-9444: Fix path usage for cloud
backup/restore Merge branch 'SOLR-9444_fix' of
https://github.com/hgadre/lucene-solr This closes #74
SOLR-9444: Fix path usage for cloud backup/restore
Merge branch 'SOLR-9444_fix' of https://github.com/hgadre/lucene-solr
This closes #74
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d9c0f2c6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d9c0f2c6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d9c0f2c6
Branch: refs/heads/master
Commit: d9c0f2c6b91bd97d7e17a0b6abf16cb9d0f71b52
Parents: e203c9a e138462
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Sep 2 14:15:09 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Fri Sep 2 14:15:09 2016 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/cloud/BackupCmd.java | 6 ++--
.../java/org/apache/solr/cloud/RestoreCmd.java | 6 ++--
.../apache/solr/core/backup/BackupManager.java | 34 +++++++++---------
.../backup/repository/BackupRepository.java | 14 ++++++--
.../backup/repository/HdfsBackupRepository.java | 29 +++++++++++++---
.../repository/LocalFileSystemRepository.java | 36 ++++++++++++--------
.../apache/solr/handler/ReplicationHandler.java | 12 ++++---
.../org/apache/solr/handler/RestoreCore.java | 6 ++--
.../org/apache/solr/handler/SnapShooter.java | 11 +++---
.../solr/handler/admin/CoreAdminOperation.java | 7 ++--
.../cloud/TestLocalFSCloudBackupRestore.java | 10 +++++-
12 files changed, 114 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d9c0f2c6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index b22ea5d,adca63e..3f1b8a5
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -103,8 -103,6 +103,10 @@@ Bug Fixe
* SOLR-9461: DELETENODE, REPLACENODE should pass down the 'async' param to subcommands (shalin, noble)
+* SOLR-9319: DELETEREPLICA can accept a 'count' and remove appropriate replicas (Nitin Sharma, noble )
+
++* SOLR-9444: Fix path usage for cloud backup/restore. (Hrishikesh Gadre, Uwe Schindler, Varun Thacker)
++
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d9c0f2c6/solr/core/src/test/org/apache/solr/cloud/TestLocalFSCloudBackupRestore.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/cloud/TestLocalFSCloudBackupRestore.java
index db68913,da8e767..c0db46e
--- a/solr/core/src/test/org/apache/solr/cloud/TestLocalFSCloudBackupRestore.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLocalFSCloudBackupRestore.java
@@@ -30,6 -31,13 +31,13 @@@ public class TestLocalFSCloudBackupRest
configureCluster(NUM_SHARDS)// nodes
.addConfig("conf1", TEST_PATH().resolve("configsets").resolve("cloud-minimal").resolve("conf"))
.configure();
+
+ boolean whitespacesInPath = random().nextBoolean();
+ if (whitespacesInPath) {
- backupLocation = createTempDir("my backup").toFile().getAbsolutePath();
++ backupLocation = createTempDir("my backup").toAbsolutePath().toString();
+ } else {
- backupLocation = createTempDir("mybackup").toFile().getAbsolutePath();
++ backupLocation = createTempDir("mybackup").toAbsolutePath().toString();
+ }
}
@Override