You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2012/10/17 19:21:26 UTC
svn commit: r1399352 - in /hbase/trunk/hbase-server/src:
main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
Author: jxiang
Date: Wed Oct 17 17:21:25 2012
New Revision: 1399352
URL: http://svn.apache.org/viewvc?rev=1399352&view=rev
Log:
HBASE-6979 recovered.edits file should not break distributed log splitting
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1399352&r1=1399351&r2=1399352&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java Wed Oct 17 17:21:25 2012
@@ -56,7 +56,6 @@ import org.apache.hadoop.hbase.io.HeapSi
import org.apache.hadoop.hbase.master.SplitLogManager;
import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.monitoring.TaskMonitor;
-import org.apache.hadoop.hbase.protobuf.RequestConverter;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.LastSequenceId;
import org.apache.hadoop.hbase.regionserver.wal.HLog.Entry;
@@ -596,8 +595,8 @@ public class HLogSplitter {
final Entry logEntry, final Path rootDir, boolean isCreate)
throws IOException {
Path tableDir = HTableDescriptor.getTableDir(rootDir, logEntry.getKey().getTablename());
- Path regiondir = HRegion.getRegionDir(tableDir,
- Bytes.toString(logEntry.getKey().getEncodedRegionName()));
+ String encodedRegionName = Bytes.toString(logEntry.getKey().getEncodedRegionName());
+ Path regiondir = HRegion.getRegionDir(tableDir, encodedRegionName);
Path dir = HLogUtil.getRegionDirRecoveredEditsDir(regiondir);
if (!fs.exists(regiondir)) {
@@ -606,6 +605,21 @@ public class HLogSplitter {
" already split so it's safe to discard those edits.");
return null;
}
+ if (fs.exists(dir) && fs.isFile(dir)) {
+ Path tmp = new Path("/tmp");
+ if (!fs.exists(tmp)) {
+ fs.mkdirs(tmp);
+ }
+ tmp = new Path(tmp,
+ HLog.RECOVERED_EDITS_DIR + "_" + encodedRegionName);
+ LOG.warn("Found existing old file: " + dir + ". It could be some "
+ + "leftover of an old installation. It should be a folder instead. "
+ + "So moving it to " + tmp);
+ if (!fs.rename(dir, tmp)) {
+ LOG.warn("Failed to sideline old file " + dir);
+ }
+ }
+
if (isCreate && !fs.exists(dir)) {
if (!fs.mkdirs(dir)) LOG.warn("mkdir failed on " + dir);
}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java?rev=1399352&r1=1399351&r2=1399352&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java Wed Oct 17 17:21:25 2012
@@ -178,6 +178,33 @@ public class TestHLogSplit {
assertEquals(parentOfParent, HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
}
+ /**
+ * Test old recovered edits file doesn't break HLogSplitter.
+ * This is useful in upgrading old instances.
+ */
+ @Test
+ public void testOldRecoveredEditsFileSidelined() throws IOException {
+ FileSystem fs = FileSystem.get(TEST_UTIL.getConfiguration());
+ byte [] encoded = HRegionInfo.FIRST_META_REGIONINFO.getEncodedNameAsBytes();
+ Path tdir = new Path(hbaseDir, Bytes.toString(HConstants.META_TABLE_NAME));
+ Path regiondir = new Path(tdir,
+ HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
+ fs.mkdirs(regiondir);
+ long now = System.currentTimeMillis();
+ HLog.Entry entry =
+ new HLog.Entry(new HLogKey(encoded,
+ HConstants.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID),
+ new WALEdit());
+ Path parent = HLogUtil.getRegionDirRecoveredEditsDir(regiondir);
+ assertEquals(parent.getName(), HLog.RECOVERED_EDITS_DIR);
+ fs.createNewFile(parent); // create a recovered.edits file
+
+ Path p = HLogSplitter.getRegionSplitEditsPath(fs, entry, hbaseDir, true);
+ String parentOfParent = p.getParent().getParent().getName();
+ assertEquals(parentOfParent, HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
+ HLogFactory.createWriter(fs, p, conf);
+ }
+
@Test(expected = OrphanHLogAfterSplitException.class)
public void testSplitFailsIfNewHLogGetsCreatedAfterSplitStarted()
throws IOException {
@@ -1256,8 +1283,6 @@ public class TestHLogSplit {
break;
}
-
-
}
private void closeOrFlush(boolean close, FSDataOutputStream out)