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

HBASE-10004 Some fixes for scoping sequence Ids to region level (Himanshu Vashishtha) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1543658 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
mbertozzi 2013-11-20 00:09:09 +00:00
parent 56d089a3e4
commit e0c324f9d5
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
View File

@ -809,7 +809,8 @@ class FSHLog implements HLog, Syncable {
// The path should start with dir/<prefix>. // The path should start with dir/<prefix>.
String prefixPathStr = new Path(dir, prefix + ".").toString(); String prefixPathStr = new Path(dir, prefix + ".").toString();
if (!fileName.toString().startsWith(prefixPathStr)) { if (!fileName.toString().startsWith(prefixPathStr)) {
throw new IllegalArgumentException("The log doesn't belong to this regionserver"); throw new IllegalArgumentException("The log file " + fileName + " doesn't belong to" +
" this regionserver " + prefixPathStr);
} }
String chompedPath = fileName.toString().substring(prefixPathStr.length()); String chompedPath = fileName.toString().substring(prefixPathStr.length());
if (forMeta) chompedPath = chompedPath.substring(0, chompedPath.indexOf(META_HLOG_FILE_EXTN)); if (forMeta) chompedPath = chompedPath.substring(0, chompedPath.indexOf(META_HLOG_FILE_EXTN));

4
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
View File

@ -289,9 +289,9 @@ public final class HLogPerformanceEvaluation extends Configured implements Tool
+ sequenceIds.get(Bytes.toString(e.getKey().getEncodedRegionName())) + sequenceIds.get(Bytes.toString(e.getKey().getEncodedRegionName()))
+ ", current seqid = " + seqid); + ", current seqid = " + seqid);
} }
} else {
sequenceIds.put(Bytes.toString(e.getKey().getEncodedRegionName()), seqid);
} }
// update the sequence Id.
sequenceIds.put(Bytes.toString(e.getKey().getEncodedRegionName()), seqid);
if (verbose) LOG.info("seqid=" + seqid); if (verbose) LOG.info("seqid=" + seqid);
} }
} finally { } finally {

9
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
View File

@ -1090,14 +1090,14 @@ public class TestHLog {
// get the regions to flush; since there is only one region in the oldest wal, it should // get the regions to flush; since there is only one region in the oldest wal, it should
// return only one region. // return only one region.
byte[][] regionsToFlush = ((FSHLog) hlog).findRegionsToForceFlush(); byte[][] regionsToFlush = ((FSHLog) hlog).findRegionsToForceFlush();
assertEquals(regionsToFlush.length, 1); assertEquals(1, regionsToFlush.length);
assertEquals(regionsToFlush[0], hri1.getEncodedNameAsBytes()); assertEquals(hri1.getEncodedNameAsBytes(), regionsToFlush[0]);
// insert edits in second region // insert edits in second region
addEdits(hlog, hri2, t2, 2, sequenceId2); addEdits(hlog, hri2, t2, 2, sequenceId2);
// get the regions to flush, it should still read region1. // get the regions to flush, it should still read region1.
regionsToFlush = ((FSHLog) hlog).findRegionsToForceFlush(); regionsToFlush = ((FSHLog) hlog).findRegionsToForceFlush();
assertEquals(regionsToFlush.length, 1); assertEquals(regionsToFlush.length, 1);
assertEquals(regionsToFlush[0], hri1.getEncodedNameAsBytes()); assertEquals(hri1.getEncodedNameAsBytes(), regionsToFlush[0]);
// flush region 1, and roll the wal file. Only last wal which has entries for region1 should // flush region 1, and roll the wal file. Only last wal which has entries for region1 should
// remain. // remain.
flushRegion(hlog, hri1.getEncodedNameAsBytes()); flushRegion(hlog, hri1.getEncodedNameAsBytes());
@ -1120,7 +1120,7 @@ public class TestHLog {
// it should return two regions to flush, as the oldest wal file has entries // it should return two regions to flush, as the oldest wal file has entries
// for both regions. // for both regions.
regionsToFlush = ((FSHLog) hlog).findRegionsToForceFlush(); regionsToFlush = ((FSHLog) hlog).findRegionsToForceFlush();
assertEquals(regionsToFlush.length, 2); assertEquals(2, regionsToFlush.length);
// flush both regions // flush both regions
flushRegion(hlog, hri1.getEncodedNameAsBytes()); flushRegion(hlog, hri1.getEncodedNameAsBytes());
flushRegion(hlog, hri2.getEncodedNameAsBytes()); flushRegion(hlog, hri2.getEncodedNameAsBytes());
@ -1147,6 +1147,7 @@ public class TestHLog {
*/ */
@Test @Test
public void testAllRegionsFlushed() { public void testAllRegionsFlushed() {
LOG.debug("testAllRegionsFlushed");
Map<byte[], Long> oldestFlushingSeqNo = new HashMap<byte[], Long>(); Map<byte[], Long> oldestFlushingSeqNo = new HashMap<byte[], Long>();
Map<byte[], Long> oldestUnFlushedSeqNo = new HashMap<byte[], Long>(); Map<byte[], Long> oldestUnFlushedSeqNo = new HashMap<byte[], Long>();
Map<byte[], Long> seqNo = new HashMap<byte[], Long>(); Map<byte[], Long> seqNo = new HashMap<byte[], Long>();