You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 04:05:54 UTC
svn commit: r1181406 - in /hbase/branches/0.89/src:
main/java/org/apache/hadoop/hbase/util/FSUtils.java
test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
Author: nspiegelberg
Date: Tue Oct 11 02:05:53 2011
New Revision: 1181406
URL: http://svn.apache.org/viewvc?rev=1181406&view=rev
Log:
Use lightweight append
Summary:
HLog splitting uses the new lightweight append API to recover lease.
Test Plan:
TBD
DiffCamp Revision: 170368
Reviewed By: kannan
Commenters: dhruba
CC: dhruba, hkuang, kannan, hbase@lists
Tasks:
#416425: Use the lightweight append
Revert Plan:
OK
Modified:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=1181406&r1=1181405&r2=1181406&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Tue Oct 11 02:05:53 2011
@@ -610,6 +610,7 @@ public class FSUtils {
if (!(fs instanceof DistributedFileSystem)) {
return;
}
+ DistributedFileSystem dfs = (DistributedFileSystem)fs;
LOG.info("Recovering file" + p);
long startWaiting = System.currentTimeMillis();
@@ -617,8 +618,7 @@ public class FSUtils {
boolean recovered = false;
while (!recovered) {
try {
- FSDataOutputStream out = fs.append(p);
- out.close();
+ dfs.recoverLease(p);
recovered = true;
} catch (IOException e) {
e = RemoteExceptionHandler.checkIOException(e);
@@ -646,4 +646,4 @@ public class FSUtils {
LOG.info("Finished lease recover attempt for " + p);
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java?rev=1181406&r1=1181405&r2=1181406&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java Tue Oct 11 02:05:53 2011
@@ -596,7 +596,7 @@ public class TestHLogSplit {
assertTrue("Failed to list status ", false);
}
flushToConsole("Juliet: split not started, sleeping a bit...");
- Threads.sleep(100);
+ Threads.sleep(10);
}
Path julietLog = new Path(hlogDir, HLOG_FILE_PREFIX + ".juliet");