From 227dfa8bd45f23ea5750b2ba95f03c36cbf786dc Mon Sep 17 00:00:00 2001 From: Enis Soztutar Date: Thu, 8 Nov 2012 22:11:10 +0000 Subject: [PATCH] HBASE-6823. [WINDOWS] TestSplitTransaction fails due to the Log handle not released by a call to DaughterOpener.start() git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1407289 13f79535-47bb-0310-9956-ffa450edef68 --- .../hbase/regionserver/TestSplitTransaction.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java index b9a9e4fd0a9..9860a5c5e4b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java @@ -248,12 +248,9 @@ public class TestSplitTransaction { assertTrue(Bytes.equals(GOOD_SPLIT_ROW, daughters.getFirst().getEndKey())); assertTrue(Bytes.equals(daughters.getSecond().getStartKey(), GOOD_SPLIT_ROW)); assertTrue(Bytes.equals(this.parent.getEndKey(), daughters.getSecond().getEndKey())); - // Count rows. + // Count rows. daughters are already open int daughtersRowCount = 0; - for (HRegion r: daughters) { - // Open so can count its content. - HRegion openRegion = HRegion.openHRegion(this.testdir, r.getRegionInfo(), - r.getTableDesc(), r.getLog(), TEST_UTIL.getConfiguration()); + for (HRegion openRegion: daughters) { try { int count = countRows(openRegion); assertTrue(count > 0 && count != rowcount); @@ -303,12 +300,9 @@ public class TestSplitTransaction { // Now retry the split but do not throw an exception this time. assertTrue(st.prepare()); PairOfSameType daughters = st.execute(mockServer, null); - // Count rows. + // Count rows. daughters are already open int daughtersRowCount = 0; - for (HRegion r: daughters) { - // Open so can count its content. - HRegion openRegion = HRegion.openHRegion(this.testdir, r.getRegionInfo(), - r.getTableDesc(), r.getLog(), TEST_UTIL.getConfiguration()); + for (HRegion openRegion: daughters) { try { int count = countRows(openRegion); assertTrue(count > 0 && count != rowcount);