You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2016/04/27 20:22:32 UTC
[48/50] [abbrv] lucene-solr:solr-5750: SOLR-5750: move location of
backup.properties and rename collection state.json
SOLR-5750: move location of backup.properties and rename collection state.json
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cf77521a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cf77521a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cf77521a
Branch: refs/heads/solr-5750
Commit: cf77521a55e721ee8da56de091d883092848093c
Parents: 42b6ed4
Author: David Smiley <ds...@apache.org>
Authored: Wed Apr 27 11:46:10 2016 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Wed Apr 27 11:46:10 2016 -0400
----------------------------------------------------------------------
.../apache/solr/cloud/OverseerCollectionMessageHandler.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cf77521a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index e1ea1dc..1966116 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -340,12 +340,12 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
Path backupZkPath = backupPath.resolve("zk_backup");
Properties properties = new Properties();
- try (Reader in = Files.newBufferedReader(backupZkPath.resolve("backup.properties"), StandardCharsets.UTF_8)) {
+ try (Reader in = Files.newBufferedReader(backupPath.resolve("backup.properties"), StandardCharsets.UTF_8)) {
properties.load(in);
}
String backupCollection = (String) properties.get("collection");
- byte[] data = Files.readAllBytes(backupZkPath.resolve("collection_state_backup.json"));
+ byte[] data = Files.readAllBytes(backupZkPath.resolve("collection_state.json"));
ClusterState backupClusterState = ClusterState.load(-1, data, Collections.emptySet());
DocCollection backupCollectionState = backupClusterState.getCollection(backupCollection);
@@ -546,11 +546,10 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
//Save the collection's state. Can be part of the monolithic clusterstate.json or a individual state.json
//Since we don't want to distinguish we extract the state and back it up as a separate json
DocCollection collection = zkStateReader.getClusterState().getCollection(collectionName);
- Files.write(zkBackup.resolve("collection_state_backup.json"),//nocommit or simply clusterstate.json?
+ Files.write(zkBackup.resolve("collection_state.json"),
Utils.toJSON(Collections.singletonMap(collectionName, collection)));
- //nocommit why is it stored in zk_backup; shouldn't it be in backupPath?
- Path propertiesPath = zkBackup.resolve("backup.properties");
+ Path propertiesPath = backupPath.resolve("backup.properties");
Properties properties = new Properties();
properties.put("snapshotName", backupName);