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/10/24 15:57:45 UTC
svn commit: r1634059 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
Author: shalin
Date: Fri Oct 24 13:57:45 2014
New Revision: 1634059
URL: http://svn.apache.org/r1634059
Log:
SOLR-6651: Fix wrong timeout logged in waitForReplicasToComeUp
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1634059&r1=1634058&r2=1634059&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Oct 24 13:57:45 2014
@@ -336,6 +336,8 @@ Other Changes
* SOLR-6578: Update commons-io dependency to the latest 2.4 version
(Steve Rowe, Shawn Heisey)
+* SOLR-6651: Fix wrong timeout logged in waitForReplicasToComeUp. (shalin)
+
================== 4.10.1 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1634059&r1=1634058&r2=1634059&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Fri Oct 24 13:57:45 2014
@@ -424,9 +424,11 @@ final class ShardLeaderElectionContext e
return;
} else {
if (cnt % 40 == 0) {
- log.info("Waiting until we see more replicas up for shard " + shardId + ": total="
- + slices.getReplicasMap().size() + " found=" + found
- + " timeoutin=" + (timeoutAt - System.nanoTime() / (float)(10^9)) + "ms");
+ log.info("Waiting until we see more replicas up for shard {}: total={}"
+ + " found={}" + found
+ + " timeoutin={}ms",
+ shardId, slices.getReplicasMap().size(), found,
+ TimeUnit.MILLISECONDS.convert(timeoutAt - System.nanoTime(), TimeUnit.NANOSECONDS));
}
}