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

Data error after majorCompaction caused by keeping MVCC for opened scanners (chunhui shen) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1358331 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
larsh 2012-07-06 18:22:00 +00:00
parent 2c48f28239
commit 6ff32a1a89
2 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
View File

@ -293,10 +293,9 @@ public class ScanQueryMatcher {
}
// Can't early out now, because DelFam come before any other keys
}
if (retainDeletesInOutput ||
(!isUserScan &&
(EnvironmentEdgeManager.currentTimeMillis() - timestamp) <=
timeToPurgeDeletes)) {
if (retainDeletesInOutput
|| (!isUserScan && (EnvironmentEdgeManager.currentTimeMillis() - timestamp) <= timeToPurgeDeletes)
|| kv.getMemstoreTS() > maxReadPointToTrackVersions) {
// always include or it is not time yet to check whether it is OK
// to purge deltes or not
return MatchCode.INCLUDE;

50
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
View File

@ -151,6 +151,56 @@ public class TestHRegion extends HBaseTestCase {
// /tmp/testtable
//////////////////////////////////////////////////////////////////////////////
public void testCompactionAffectedByScanners() throws Exception {
String method = "testCompactionAffectedByScanners";
byte[] tableName = Bytes.toBytes(method);
byte[] family = Bytes.toBytes("family");
Configuration conf = HBaseConfiguration.create();
this.region = initHRegion(tableName, method, conf, family);
Put put = new Put(Bytes.toBytes("r1"));
put.add(family, Bytes.toBytes("q1"), Bytes.toBytes("v1"));
region.put(put);
region.flushcache();
Scan scan = new Scan();
scan.setMaxVersions(3);
// open the first scanner
RegionScanner scanner1 = region.getScanner(scan);
Delete delete = new Delete(Bytes.toBytes("r1"));
region.delete(delete, null, false);
region.flushcache();
// open the second scanner
RegionScanner scanner2 = region.getScanner(scan);
List<KeyValue> results = new ArrayList<KeyValue>();
System.out.println("Smallest read point:" + region.getSmallestReadPoint());
// make a major compaction
region.compactStores(true);
// open the third scanner
RegionScanner scanner3 = region.getScanner(scan);
// get data from scanner 1, 2, 3 after major compaction
scanner1.next(results);
System.out.println(results);
assertEquals(1, results.size());
results.clear();
scanner2.next(results);
System.out.println(results);
assertEquals(0, results.size());
results.clear();
scanner3.next(results);
System.out.println(results);
assertEquals(0, results.size());
}
public void testSkipRecoveredEditsReplay() throws Exception {
String method = "testSkipRecoveredEditsReplay";