diff --git src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java index a3eb32f..cbef70f 100644 --- src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java +++ src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java @@ -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; } } diff --git src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java index 373f850..b2f816e 100644 --- src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java +++ src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java @@ -255,6 +255,7 @@ public class TestDistributedLogSplitting { * detects that the region server has aborted. * @throws Exception */ + @Ignore @Test (timeout=300000) public void testWorkerAbort() throws Exception { LOG.info("testWorkerAbort");