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/03 20:26:26 UTC
[2/4] lucene-solr:jira/solr-10233: Added logging
Added logging
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e9f3b3a5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e9f3b3a5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e9f3b3a5
Branch: refs/heads/jira/solr-10233
Commit: e9f3b3a51bd0626e53517fcd8518225cb1f688b4
Parents: ccea105
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Wed May 3 11:17:41 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Wed May 3 11:17:41 2017 -0700
----------------------------------------------------------------------
.../core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java | 1 +
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 4 ++--
.../src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9f3b3a5/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
index b0bca44..4441018 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
@@ -70,6 +70,7 @@ public class ReplicateFromLeader {
} else if (uinfo.autoSoftCommmitMaxTime != -1) {
pollIntervalStr = toPollIntervalStr(uinfo.autoSoftCommmitMaxTime/2);
}
+ LOG.info("Will start replication from leader with poll interval: {}", pollIntervalStr );
NamedList slaveConfig = new NamedList();
slaveConfig.add("fetchFromLeader", true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9f3b3a5/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index e4e98da..509a74d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -969,7 +969,7 @@ public class ZkController {
}
public void startReplicationFromLeader(String coreName, boolean switchTransactionLog) throws InterruptedException {
- log.info("{} starting replication from leader", coreName);
+ log.info("{} starting background replication from leader", coreName);
ReplicateFromLeader replicateFromLeader = new ReplicateFromLeader(cc, coreName);
if (replicateFromLeaders.putIfAbsent(coreName, replicateFromLeader) == null) {
replicateFromLeader.startReplication(switchTransactionLog);
@@ -979,7 +979,7 @@ public class ZkController {
}
public void stopReplicationFromLeader(String coreName) {
- log.info("{} stopping replication from leader", coreName);
+ log.info("{} stopping background replication from leader", coreName);
ReplicateFromLeader replicateFromLeader = replicateFromLeaders.remove(coreName);
if (replicateFromLeader != null) {
replicateFromLeader.stopReplication();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e9f3b3a5/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 625230f..c0a6caf 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -791,7 +791,7 @@ public class ZkStateReader implements Closeable {
public List<ZkCoreNodeProps> getReplicaProps(String collection, String shardId, String thisCoreNodeName,
Replica.State mustMatchStateFilter, Replica.State mustNotMatchStateFilter) {
- //nocommit: We don't need all these getReplicaProps overloading. Also, it's odd that the default is to return replicas of type APPEND and REALTIME only
+ //nocommit: We don't need all these getReplicaProps method overloading. Also, it's odd that the default is to return replicas of type APPEND and REALTIME only
return getReplicaProps(collection, shardId, thisCoreNodeName, mustMatchStateFilter, null, EnumSet.of(Replica.Type.APPEND, Replica.Type.REALTIME));
}