You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/02/27 20:16:38 UTC
svn commit: r1450928 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
Author: tedyu
Date: Wed Feb 27 19:16:37 2013
New Revision: 1450928
URL: http://svn.apache.org/r1450928
Log:
HBASE-7878 Addendum for trying fs.append in case recoverLease throws exception
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java?rev=1450928&r1=1450927&r2=1450928&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java Wed Feb 27 19:16:37 2013
@@ -91,15 +91,13 @@ public class FSHDFSUtils extends FSUtils
throw (IOException) ite.getCause();
}
} catch (Exception e) {
- // hdfs 2.0 may throw RecoveryInProgressException
- if (!e.getClass().getName().contains("RecoveryInProgressException")) {
- LOG.debug("Failed fs.recoverLease invocation, " + e.toString() +
- ", trying fs.append instead");
- ex = e;
- }
+ LOG.debug("Failed fs.recoverLease invocation, " + e.toString() +
+ ", trying fs.append instead");
+ ex = e;
}
if (ex != null || System.currentTimeMillis() - startWaiting > recoveryTimeout) {
ex = null; // assume the following append() call would succeed
+ LOG.debug("trying fs.append for " + p);
FSDataOutputStream out = fs.append(p);
out.close();
recovered = true;