You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/07/14 09:46:59 UTC
svn commit: r1610351 - in
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud:
ElectionContext.java RecoveryStrategy.java
Author: shalin
Date: Mon Jul 14 07:46:59 2014
New Revision: 1610351
URL: http://svn.apache.org/r1610351
Log:
SOLR-6235: Improved logging in RecoveryStrategy and fixed a mistake in ElectionContext logging that I had made earlier.
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1610351&r1=1610350&r2=1610351&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Mon Jul 14 07:46:59 2014
@@ -354,8 +354,8 @@ final class ShardLeaderElectionContext e
String lirState = zkController.getLeaderInitiatedRecoveryState(coll, shardId, replicaCoreNodeName);
if (ZkStateReader.DOWN.equals(lirState) || ZkStateReader.RECOVERY_FAILED.equals(lirState)) {
- log.info("After core={} coreNodeName={} was elected leader, it was found in state: "
- + lirState + " and needing recovery.", coreName, coreNodeName);
+ log.info("After core={} coreNodeName={} was elected leader, a replica coreNodeName={} was found in state: "
+ + lirState + " and needing recovery.", coreName, coreNodeName, replicaCoreNodeName);
List<ZkCoreNodeProps> replicaProps =
zkController.getZkStateReader().getReplicaProps(collection, shardId, coreNodeName);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java?rev=1610351&r1=1610350&r2=1610351&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java Mon Jul 14 07:46:59 2014
@@ -117,7 +117,7 @@ public class RecoveryStrategy extends Th
} catch (NullPointerException e) {
// okay
}
- log.warn("Stopping recovery for zkNodeName=" + coreZkNodeName + "core=" + coreName);
+ log.warn("Stopping recovery for core={} coreNodeName={}", coreName, coreZkNodeName);
}