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:31 UTC
[47/50] [abbrv] lucene-solr:solr-5750: SOLR-5750: remove nocommit for
snapshotName prop name; keep consistent
SOLR-5750: remove nocommit for snapshotName prop name; keep consistent
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/42b6ed49
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/42b6ed49
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/42b6ed49
Branch: refs/heads/solr-5750
Commit: 42b6ed4909f0c7e544b294fcdf98fed626090f29
Parents: 6a9cc1a
Author: David Smiley <ds...@apache.org>
Authored: Wed Apr 27 11:39:03 2016 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Wed Apr 27 11:39:03 2016 -0400
----------------------------------------------------------------------
.../cloud/OverseerCollectionMessageHandler.java | 19 ++++++++++---------
.../solrj/request/CollectionAdminRequest.java | 4 ++--
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/42b6ed49/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 40907f5..e1ea1dc 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -492,12 +492,13 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
}
}
- log.info("Completed restoring collection={} backup={}", restoreCollection, backupName);
+ log.info("Completed restoring collection={} snapshotName={}", restoreCollection, backupName);
}
+ //nocommit this should precede processRestoreAction
private void processBackupAction(ZkNodeProps message, NamedList results) throws IOException, KeeperException, InterruptedException {
String collectionName = message.getStr(COLLECTION_PROP);
- String name = message.getStr(NAME);
+ String backupName = message.getStr(NAME);
String location = message.getStr("location");
ShardHandler shardHandler = shardHandlerFactory.getShardHandler();
String asyncId = message.getStr(ASYNC);
@@ -505,7 +506,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
Instant startTime = Instant.now();
// note: we assume a shared files system to backup a collection, since a collection is distributed
- Path backupPath = Paths.get(location).resolve(name).toAbsolutePath();
+ Path backupPath = Paths.get(location).resolve(backupName).toAbsolutePath();
//Validating if the directory already exists.
if (Files.exists(backupPath)) {
@@ -514,7 +515,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
}
Files.createDirectory(backupPath); // create now
- log.info("Starting backup of collection={} with backup_name={} at location={}", collectionName, name,
+ log.info("Starting backup of collection={} with snapshotName={} at location={}", collectionName, backupName,
backupPath);
for (Slice slice : zkStateReader.getClusterState().getCollection(collectionName).getActiveSlices()) {
@@ -529,13 +530,13 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
params.set(CORE_NAME_PROP, coreName);
sendShardRequest(replica.getNodeName(), params, shardHandler, asyncId, requestMap);
- log.debug("Sent backup request to core={} for backup_name={}", coreName, name);
+ log.debug("Sent backup request to core={} for snapshotName={}", coreName, backupName);
}
- log.debug("Sent backup requests to all shard leaders for backup_name={}", name);
+ log.debug("Sent backup requests to all shard leaders for snapshotName={}", backupName);
processResponses(results, shardHandler, true, "Could not backup all replicas", asyncId, requestMap);
- log.info("Starting to backup ZK data for backup_name={}", name);
+ log.info("Starting to backup ZK data for snapshotName={}", backupName);
//Download the configs
String configName = zkStateReader.readConfigName(collectionName);
@@ -552,7 +553,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
Path propertiesPath = zkBackup.resolve("backup.properties");
Properties properties = new Properties();
- properties.put("snapshotName", name); //nocommit or simply "backupName" (consistent with "backup" term?)
+ properties.put("snapshotName", backupName);
properties.put("collection", collectionName);
properties.put("collection.configName", configName);
properties.put("startTime", startTime.toString());
@@ -564,7 +565,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
properties.store(os, "Snapshot properties file");
}
- log.info("Completed backing up ZK data for backup={}", name);
+ log.info("Completed backing up ZK data for snapshotName={}", backupName);
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/42b6ed49/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index 4af5c00..4a95133 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@ -568,7 +568,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
public SolrParams getParams() {
ModifiableSolrParams params = (ModifiableSolrParams) super.getParams();
params.set(CoreAdminParams.COLLECTION, collection); // nocommit reconsider to use NAME (set via super.getParams)
- params.set(CoreAdminParams.NAME, name); // nocommit reconsider to use backupName?
+ params.set(CoreAdminParams.NAME, name); // nocommit reconsider to use snapshotName or snapshot?
params.set("location", location); //note: optional
return params;
}
@@ -641,7 +641,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
public SolrParams getParams() {
ModifiableSolrParams params = (ModifiableSolrParams) super.getParams();
params.set(CoreAdminParams.COLLECTION, collection); // nocommit reconsider to use NAME (set via super.getParams)
- params.set(CoreAdminParams.NAME, backupName); // nocommit reconsider to use backupName?
+ params.set(CoreAdminParams.NAME, backupName); // nocommit reconsider to use snapshotName or snapshot?
params.set("location", location); //note: optional
params.set("collection.configName", configName); //note: optional
if (maxShardsPerNode != null) {