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

HBASE-5568 Multi concurrent flushcache() for one region could cause data loss (Chunhui) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1301639 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-03-16 16:39:44 +00:00
parent 4a5a27eac2
commit 8e84390b37
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -1318,22 +1318,22 @@ public class HRegion implements HeapSize { // , Writable{
status.setStatus("Running coprocessor pre-flush hooks"); status.setStatus("Running coprocessor pre-flush hooks");
coprocessorHost.preFlush(); coprocessorHost.preFlush();
} }
try {
synchronized (writestate) { synchronized (writestate) {
if (!writestate.flushing && writestate.writesEnabled) { if (!writestate.flushing && writestate.writesEnabled) {
this.writestate.flushing = true; this.writestate.flushing = true;
} else { } else {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("NOT flushing memstore for region " + this + LOG.debug("NOT flushing memstore for region " + this
", flushing=" + + ", flushing=" + writestate.flushing + ", writesEnabled="
writestate.flushing + ", writesEnabled=" + + writestate.writesEnabled);
writestate.writesEnabled);
} }
status.abort("Not flushing since " + status.abort("Not flushing since "
(writestate.flushing ? "already flushing" : "writes not enabled")); + (writestate.flushing ? "already flushing"
: "writes not enabled"));
return false; return false;
} }
} }
try {
boolean result = internalFlushcache(status); boolean result = internalFlushcache(status);
if (coprocessorHost != null) { if (coprocessorHost != null) {

2
src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
View File

@ -152,7 +152,7 @@ public class TestStore extends TestCase {
public void testDeleteExpiredStoreFiles() throws Exception { public void testDeleteExpiredStoreFiles() throws Exception {
int storeFileNum = 4; int storeFileNum = 4;
int ttl = 1; int ttl = 4;
Configuration conf = HBaseConfiguration.create(); Configuration conf = HBaseConfiguration.create();
// Enable the expired store file deletion // Enable the expired store file deletion