Author: jdcryans
Date: Tue Aug 2 22:35:53 2011
New Revision: 1153294
URL: http://svn.apache.org/viewvc?rev=1153294&view=rev
Log:
HBASE-3065 adding a missing removeMetaData in SplitLogWorker.java
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java?rev=1153294&r1=1153293&r2=1153294&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
Tue Aug 2 22:35:53 2011
@@ -537,6 +537,7 @@ public class SplitLogWorker extends ZooK
getDataSetWatchFailure(path);
return;
}
+ data = watcher.getRecoverableZooKeeper().removeMetaData(data);
getDataSetWatchSuccess(path, data);
return;
}
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java?rev=1153294&r1=1153293&r2=1153294&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
Tue Aug 2 22:35:53 2011
@@ -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);
