You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/19 00:14:11 UTC
[50/50] [abbrv] lucene-solr:jira/solr-10233: Fix precommit. Added
some javadocs
Fix precommit. Added some javadocs
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ef736a15
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ef736a15
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ef736a15
Branch: refs/heads/jira/solr-10233
Commit: ef736a15b6dd79939e9a437be4b9d0b61432ebae
Parents: f67b309
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu May 18 16:51:53 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu May 18 16:51:53 2017 -0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/Assign.java | 2 +-
.../java/org/apache/solr/cloud/RecoveryStrategy.java | 2 +-
solr/core/src/test-files/log4j.properties | 14 +++-----------
.../src/test/org/apache/solr/cloud/AssignTest.java | 6 ++++++
.../solr/client/solrj/impl/CloudSolrClient.java | 9 ++-------
.../org/apache/solr/common/cloud/DocCollection.java | 9 +++++++++
6 files changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef736a15/solr/core/src/java/org/apache/solr/cloud/Assign.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Assign.java b/solr/core/src/java/org/apache/solr/cloud/Assign.java
index 924ff17..265e453 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Assign.java
@@ -110,7 +110,7 @@ public class Assign {
public static String buildCoreName(String collectionName, String shard, Replica.Type type, int replicaNum) {
// TODO: Adding the suffix is great for debugging, but may be an issue if at some point we want to support a way to change replica type
- return collectionName + "_" + shard + "_replica_" + type.name().substring(0,1).toLowerCase() + replicaNum;
+ return String.format(Locale.ROOT, "%s_%s_replica_%s%s", collectionName, shard, type.name().substring(0,1).toLowerCase(Locale.ROOT), replicaNum);
}
public static String buildCoreName(DocCollection collection, String shard, Replica.Type type) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef736a15/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index da75195..83380a1 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -261,7 +261,7 @@ public class RecoveryStrategy implements Runnable, Closeable {
UpdateRequest ureq = new UpdateRequest();
ureq.setParams(new ModifiableSolrParams());
ureq.getParams().set(DistributedUpdateProcessor.COMMIT_END_POINT, true);
-// ureq.getParams().set(UpdateParams.OPEN_SEARCHER, onlyLeaderIndexes);// nocommit: Why do we need to open searcher if "onlyLeaderIndexes"?
+// ureq.getParams().set(UpdateParams.OPEN_SEARCHER, onlyLeaderIndexes);// Why do we need to open searcher if "onlyLeaderIndexes"?
ureq.getParams().set(UpdateParams.OPEN_SEARCHER, false);
ureq.setAction(AbstractUpdateRequest.ACTION.COMMIT, false, true).process(
client);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef736a15/solr/core/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/log4j.properties b/solr/core/src/test-files/log4j.properties
index 73f7553..2697203 100644
--- a/solr/core/src/test-files/log4j.properties
+++ b/solr/core/src/test-files/log4j.properties
@@ -1,6 +1,5 @@
# Logging level
-# nocommit: revert this file before back to master
-log4j.rootLogger=DEBUG, CONSOLE
+log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err
@@ -11,13 +10,6 @@ log4j.logger.org.apache.hadoop=WARN
log4j.logger.org.apache.directory=WARN
log4j.logger.org.apache.solr.hadoop=INFO
-log4j.logger.org.apache.solr.cloud.OverseerTaskProcessor=INFO
-log4j.logger.org.apache.solr.cloud.OverseerTaskQueue=INFO
-log4j.logger.org.apache.solr.cloud.OverseerTaskQueue=INFO
-log4j.logger.org.apache.solr.common.cloud.SolrZkClient=INFO
-log4j.logger.org.apache.solr.util.stats.InstrumentedPoolingHttpClientConnectionManager=INFO
-log4j.logger.com.codehale.metrics=INFO
-log4j.logger.com.codahale.metrics.JmxReporter=INFO
#log4j.logger.org.apache.solr.update.processor.LogUpdateProcessorFactory=DEBUG
#log4j.logger.org.apache.solr.update.processor.DistributedUpdateProcessor=DEBUG
#log4j.logger.org.apache.solr.update.PeerSync=DEBUG
@@ -39,6 +31,6 @@ log4j.logger.com.codahale.metrics.JmxReporter=INFO
#log4j.logger.org.apache.http.impl.conn.PoolingHttpClientConnectionManager=DEBUG
#log4j.logger.org.apache.http.impl.conn.BasicClientConnectionManager=DEBUG
-log4j.logger.org.apache.http=INFO
+#log4j.logger.org.apache.http=DEBUG
#log4j.logger.org.apache.solr.client.solrj.impl.SolrHttpRequestRetryHandler=DEBUG
-log4j.logger.org.eclipse.jetty=INFO
+#log4j.logger.org.eclipse.jetty=DEBUG
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef736a15/solr/core/src/test/org/apache/solr/cloud/AssignTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/AssignTest.java b/solr/core/src/test/org/apache/solr/cloud/AssignTest.java
index 7593f3b..8e32510 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AssignTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AssignTest.java
@@ -87,4 +87,10 @@ public class AssignTest extends SolrTestCaseJ4 {
assertEquals("core_node2", nodeName);
}
+ @Test
+ public void testBuildCoreName() {
+ assertEquals("Core name pattern changed", "collection1_shard1_replica_n1", Assign.buildCoreName("collection1", "shard1", Replica.Type.NRT, 1));
+ assertEquals("Core name pattern changed", "collection1_shard2_replica_p2", Assign.buildCoreName("collection1", "shard2", Replica.Type.PULL,2));
+ }
+
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef736a15/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index a9c6d6d..ff7b06a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -898,7 +897,7 @@ public class CloudSolrClient extends SolrClient {
String url = zkProps.getCoreUrl();
urls.add(url);
if (!directUpdatesToLeadersOnly) {
- for (Replica replica : slice.getReplicas(EnumSet.of(Replica.Type.TLOG, Replica.Type.NRT))) {
+ for (Replica replica : slice.getReplicas()) {
if (!replica.getNodeName().equals(leader.getNodeName()) &&
!replica.getName().equals(leader.getName())) {
ZkCoreNodeProps zkProps1 = new ZkCoreNodeProps(replica);
@@ -1325,7 +1324,6 @@ public class CloudSolrClient extends SolrClient {
ClientUtils.addSlices(slices, collectionName, routeSlices, true);
}
Set<String> liveNodes = stateProvider.liveNodes();
- log.debug("Live Nodes: {}", liveNodes);//nocommit
List<String> leaderUrlList = null;
List<String> urlList = null;
@@ -1340,10 +1338,7 @@ public class CloudSolrClient extends SolrClient {
ZkCoreNodeProps coreNodeProps = new ZkCoreNodeProps(nodeProps);
String node = coreNodeProps.getNodeName();
if (!liveNodes.contains(coreNodeProps.getNodeName())
- || Replica.State.getState(coreNodeProps.getState()) != Replica.State.ACTIVE) {
- log.debug("{} not in liveNodes, skipping", coreNodeProps.getNodeName());//nocommit
- continue;
- }
+ || Replica.State.getState(coreNodeProps.getState()) != Replica.State.ACTIVE) continue;
if (nodes.put(node, nodeProps) == null) {
if (!sendToLeaders || coreNodeProps.isLeader()) {
String url;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef736a15/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
index 47bdce3..5c3f895 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
@@ -342,14 +342,23 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
return super.equals(that) && Objects.equals(this.znode, other.znode) && this.znodeVersion == other.znodeVersion;
}
+ /**
+ * @return the number of replicas of type {@link org.apache.solr.common.cloud.Replica.Type#NRT} this collection was created with
+ */
public Integer getNumNrtReplicas() {
return numNrtReplicas;
}
+ /**
+ * @return the number of replicas of type {@link org.apache.solr.common.cloud.Replica.Type#TLOG} this collection was created with
+ */
public Integer getNumTlogReplicas() {
return numTlogReplicas;
}
+ /**
+ * @return the number of replicas of type {@link org.apache.solr.common.cloud.Replica.Type#PULL} this collection was created with
+ */
public Integer getNumPullReplicas() {
return numPullReplicas;
}