diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index de844ba..fefbbbd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -3751,8 +3751,8 @@ public class TestHRegion { String method = "testFlushCacheWhileScanning"; this.region = initHRegion(tableName, method, CONF, family); + FlushThread flushThread = new FlushThread(); try { - FlushThread flushThread = new FlushThread(); flushThread.start(); Scan scan = new Scan(); @@ -3795,10 +3795,10 @@ public class TestHRegion { } } + } finally { flushThread.done(); flushThread.join(); flushThread.checkNoError(); - } finally { HRegion.closeHRegion(this.region); this.region = null; } @@ -3888,12 +3888,12 @@ public class TestHRegion { String method = "testWritesWhileScanning"; this.region = initHRegion(tableName, method, CONF, families); + FlushThread flushThread = new FlushThread(); try { PutThread putThread = new PutThread(numRows, families, qualifiers); putThread.start(); putThread.waitForFirstPut(); - FlushThread flushThread = new FlushThread(); flushThread.start(); Scan scan = new Scan(Bytes.toBytes("row0"), Bytes.toBytes("row1")); @@ -3936,10 +3936,10 @@ public class TestHRegion { putThread.join(); putThread.checkNoError(); + } finally { flushThread.done(); flushThread.join(); flushThread.checkNoError(); - } finally { try { LOG.info("Before close: " + this.region.getMVCC()); HRegion.closeHRegion(this.region);