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

HBASE-12535 NPE in WALFactory under contention for getInstance() 

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
Sean Busbey 2014-11-19 14:23:00 -06:00 committed by stack
parent 05ced20a34
commit db2b6421ff
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java
View File

@ -187,7 +187,11 @@ public class WALFactory {
if (null != metaProvider) { if (null != metaProvider) {
metaProvider.close(); metaProvider.close();
} }
provider.close(); // close is called on a WALFactory with null provider in the case of contention handling
// within the getInstance method.
if (null != provider) {
provider.close();
}
} }
/** /**

5
hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
View File

@ -152,6 +152,11 @@ public class TestWALFactory {
TEST_UTIL.shutdownMiniCluster(); TEST_UTIL.shutdownMiniCluster();
} }
@Test
public void canCloseSingleton() throws IOException {
WALFactory.getInstance(conf).close();
}
/** /**
* Just write multiple logs then split. Before fix for HADOOP-2283, this * Just write multiple logs then split. Before fix for HADOOP-2283, this
* would fail. * would fail.