Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-5029 TestDistributedLogSplitting fails on occasion; Added catch of NPE and reenabled ignored test 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1220991 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-12-19 23:04:15 +00:00
parent 2062ea1d00
commit 1222383f1d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java
View File

@ -211,7 +211,12 @@ public class SequenceFileLogWriter implements HLog.Writer {
@Override
public void close() throws IOException {
if (this.writer != null) {
this.writer.close();
try {
this.writer.close();
} catch (NullPointerException npe) {
// Can get a NPE coming up from down in DFSClient$DFSOutputStream#close
LOG.warn(npe);
}
this.writer = null;
}
}

1
src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
View File

@ -254,7 +254,6 @@ public class TestDistributedLogSplitting {
* detects that the region server has aborted.
* @throws Exception
*/
@Ignore
@Test (timeout=300000)
public void testWorkerAbort() throws Exception {
LOG.info("testWorkerAbort");