diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java b/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java index d1452d3257c..a43e0b3dfe3 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java @@ -537,6 +537,7 @@ public class SplitLogWorker extends ZooKeeperListener implements Runnable { getDataSetWatchFailure(path); return; } + data = watcher.getRecoverableZooKeeper().removeMetaData(data); getDataSetWatchSuccess(path, data); return; } diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java index 5fb0821b769..a3680686258 100644 --- a/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java +++ b/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java @@ -207,7 +207,7 @@ public class TestMultiParallel { doTestFlushCommits(true); } - @Test (timeout=300000) + @Test (timeout=300000) public void testFlushCommitsNoAbort() throws Exception { LOG.info("test=testFlushCommitsNoAbort"); doTestFlushCommits(false); @@ -261,7 +261,7 @@ public class TestMultiParallel { LOG.info("done"); } - @Test (timeout=300000) + @Test (timeout=300000) public void testBatchWithPut() throws Exception { LOG.info("test=testBatchWithPut"); HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE); @@ -312,7 +312,7 @@ public class TestMultiParallel { } - @Test(timeout=300000) + @Test(timeout=300000) public void testHTableDeleteWithList() throws Exception { LOG.info("test=testHTableDeleteWithList"); HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE); @@ -341,7 +341,7 @@ public class TestMultiParallel { } - @Test(timeout=300000) + @Test(timeout=300000) public void testBatchWithManyColsInOneRowGetAndPut() throws Exception { LOG.info("test=testBatchWithManyColsInOneRowGetAndPut"); HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE); @@ -378,7 +378,7 @@ public class TestMultiParallel { } - @Test(timeout=300000) + @Test(timeout=300000) public void testBatchWithMixedActions() throws Exception { LOG.info("test=testBatchWithMixedActions"); HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);