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

HBASE-2667 TestHLog.testSplit failing in trunk 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@951657 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-06-05 05:53:03 +00:00
parent 64c6a071d7
commit 650b6cea53
3 changed files with 57 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -372,7 +372,7 @@ Release 0.21.0 - Unreleased
from web UI
HBASE-2657 TestTableResource is broken in trunk
HBASE-2662 TestScannerResource.testScannerResource broke in trunk
HBASE-2667 TestHLog.testSplit failing in trunk
HBASE-2667 TestHLog.testSplit failing in trunk (Cosmin and Stack)
HBASE-2614 killing server in TestMasterTransitions causes NPEs and test deadlock
IMPROVEMENTS

8
src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
View File

@ -1520,7 +1520,7 @@ public class HLog implements HConstants, Syncable {
queue = new LinkedList<Entry>();
splitLogsMap.put(region, queue);
}
queue.addFirst(entry);
queue.addLast(entry);
editsCount++;
}
LOG.debug("Pushed=" + editsCount + " entries from " + path);
@ -1552,11 +1552,7 @@ public class HLog implements HConstants, Syncable {
try {
int editsCount = 0;
WriterAndPath wap = logWriters.get(region);
// We put edits onto the Stack ordered oldest sequence id to newest.
// Pop them off starting with the oldest.
for (ListIterator<Entry> iterator = entries.listIterator(entries.size());
iterator.hasPrevious();) {
Entry logEntry = iterator.previous();
for (Entry logEntry: entries) {
if (wap == null) {
Path logFile = getRegionLogPath(logEntry, rootDir);
if (fs.exists(logFile)) {

79
src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
View File

@ -28,13 +28,10 @@ import java.io.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import javax.naming.InsufficientResourcesException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
@ -42,13 +39,11 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hdfs.MiniDFSCluster;
@ -161,7 +156,23 @@ public class TestHLogSplit {
}
}
//TODO: check the edits order is respected (scenarios)
@Test
public void testSplitPreservesEdits() throws IOException{
final String REGION = "region__1";
regions.removeAll(regions);
regions.add(REGION);
generateHLogs(1, 10, -1);
fs.initialize(fs.getUri(), conf);
HLog.splitLog(hbaseDir, hlogDir, oldLogDir, fs, conf);
Path originalLog = (fs.listStatus(oldLogDir))[0].getPath();
Path splitLog = getLogForRegion(hbaseDir, TABLE_NAME, REGION);
assertEquals("edits differ after split", true, logsAreEqual(originalLog, splitLog));
}
@Test
public void testEmptyLogFiles() throws IOException {
@ -458,7 +469,7 @@ public class TestHLogSplit {
public void testSplittingLargeNumberOfRegionsConsistency() throws IOException {
regions.removeAll(regions);
for (int i=0; i<500; i++) {
for (int i=0; i<100; i++) {
regions.add("region__"+i);
}
@ -476,24 +487,12 @@ public class TestHLogSplit {
fs.initialize(fs.getUri(), conf);
HLog.splitLog(hbaseDir, hlogDir, oldLogDir, fs, conf);
FileStatus[] f1 = fs.listStatus(firstSplitPath);
FileStatus[] f2 = fs.listStatus(splitPath);
for (int i=0; i<f1.length; i++) {
HLog.Reader in1, in2;
in1 = HLog.getReader(fs, new Path(f1[i].getPath(), "oldlogfile.log"), conf);
in2 = HLog.getReader(fs, new Path(f2[i].getPath(), "oldlogfile.log"), conf);
HLog.Entry entry1;
HLog.Entry entry2;
while ((entry1 = in1.next()) != null) {
entry2 = in2.next();
assertEquals(0, entry1.getKey().compareTo(entry2.getKey()));
assertEquals(entry1.getEdit().toString(), entry2.getEdit().toString());
}
}
assertEquals(0, compareHLogSplitDirs(firstSplitPath, splitPath));
}
/**
* This thread will keep writing to the file after the split process has started
* It simulates a region server that was considered dead but woke up and wrote
@ -629,7 +628,7 @@ public class TestHLogSplit {
return new Path(HRegion.getRegionDir(HTableDescriptor
.getTableDir(rootdir, table),
HRegionInfo.encodeRegionName(region.getBytes())),
"oldlogfile.log");
HConstants.HREGION_OLDLOGFILE_NAME);
}
private void corruptHLog(Path path, Corruptions corruption, boolean close,
@ -732,4 +731,34 @@ public class TestHLogSplit {
}
private int compareHLogSplitDirs(Path p1, Path p2) throws IOException {
FileStatus[] f1 = fs.listStatus(p1);
FileStatus[] f2 = fs.listStatus(p2);
for (int i=0; i<f1.length; i++) {
if (!logsAreEqual(new Path(f1[i].getPath(), HConstants.HREGION_OLDLOGFILE_NAME),
new Path(f2[i].getPath(), HConstants.HREGION_OLDLOGFILE_NAME))) {
return -1;
}
}
return 0;
}
private boolean logsAreEqual(Path p1, Path p2) throws IOException {
HLog.Reader in1, in2;
in1 = HLog.getReader(fs, p1, conf);
in2 = HLog.getReader(fs, p2, conf);
HLog.Entry entry1;
HLog.Entry entry2;
while ((entry1 = in1.next()) != null) {
entry2 = in2.next();
if ((entry1.getKey().compareTo(entry2.getKey()) != 0) ||
(!entry1.getEdit().toString().equals(entry2.getEdit().toString()))) {
return false;
}
}
return true;
}
}