You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/04/10 23:19:36 UTC
svn commit: r1672775 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java
Author: markrmiller
Date: Fri Apr 10 21:19:35 2015
New Revision: 1672775
URL: http://svn.apache.org/r1672775
Log:
SOLR-7370: FSHDFSUtils#recoverFileLease tries to recover the lease every one second after the first four second wait.
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/util/FSHDFSUtils.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=1672775&r1=1672774&r2=1672775&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Apr 10 21:19:35 2015
@@ -46,6 +46,9 @@ Bug Fixes
* SOLR-7066: autoAddReplicas feature has bug when selecting replacement nodes. (Mark Miller)
+* SOLR-7370: FSHDFSUtils#recoverFileLease tries to recover the lease every one second after
+ the first four second wait. (Mark Miller)
+
* SOLR-7369: AngularJS UI insufficient URLDecoding in cloud/tree view (janhoy)
Optimizations
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java?rev=1672775&r1=1672774&r2=1672775&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java Fri Apr 10 21:19:35 2015
@@ -91,7 +91,7 @@ public class FSHDFSUtils {
// This should be set to how long it'll take for us to timeout against primary datanode if it
// is dead. We set it to 61 seconds, 1 second than the default READ_TIMEOUT in HDFS, the
// default value for DFS_CLIENT_SOCKET_TIMEOUT_KEY.
- long subsequentPause = conf.getInt("solr.hdfs.lease.recovery.dfs.timeout", 61 * 1000);
+ long subsequentPause = TimeUnit.NANOSECONDS.convert(conf.getInt("solr.hdfs.lease.recovery.dfs.timeout", 61 * 1000), TimeUnit.MILLISECONDS);
Method isFileClosedMeth = null;
// whether we need to look for isFileClosed method