Apache9 commented on a change in pull request #3679:
URL: https://github.com/apache/hbase/pull/3679#discussion_r707846995
##########
File path:
hbase-server/src/test/java/org/apache/hadoop/hbase/master/region/MasterRegionTestBase.java
##########
@@ -78,6 +78,11 @@ public void setUp() throws IOException {
htu.getConfiguration().setBoolean(MemStoreLAB.USEMSLAB_KEY, false);
// Runs on local filesystem. Test does not need sync. Turn off checks.
htu.getConfiguration().setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,
false);
+
+ create();
+ }
+
+ public void create() throws IOException {
Review comment:
Better give it a more specific name? And does it need to be public?
Protected is enough?
##########
File path:
hbase-server/src/test/java/org/apache/hadoop/hbase/master/region/TestMasterRegionWALRecovery.java
##########
@@ -0,0 +1,96 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.master.region;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.testclassification.MasterTests;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Category({ MasterTests.class, MediumTests.class })
+public class TestMasterRegionWALRecovery extends MasterRegionTestBase {
+ private static final Logger LOG =
LoggerFactory.getLogger(TestMasterRegionWALRecovery.class);
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestMasterRegionWALRecovery.class);
+
+ private Path masterRegionDir;
+
+ @Override
+ protected void postSetUp() throws IOException {
+ Configuration conf = htu.getConfiguration();
+ Path testDir = htu.getDataTestDir();
+ FileSystem fs = testDir.getFileSystem(conf);
+ masterRegionDir = new Path(testDir, REGION_DIR_NAME);
+ }
+
+ @Test
+ public void test() throws IOException, InterruptedException {
+ region
+ .update(r -> r.put(new Put(Bytes.toBytes(1)).addColumn(CF1, QUALIFIER,
Bytes.toBytes(1))));
+ region.flush(true);
+
+ Path testDir = htu.getDataTestDir();
+ FileSystem fs = testDir.getFileSystem(htu.getConfiguration());
+ region.close(false);
+
+ Path masterRegionWalDir = new Path(masterRegionDir,
HConstants.HREGION_LOGDIR_NAME);
+ LOG.info("WAL dir: {}", masterRegionWalDir);
+ assertTrue(fs.exists(masterRegionWalDir));
+ // Make sure we have the WAL for the localhost "server"
+ FileStatus[] files = fs.listStatus(masterRegionWalDir);
+ LOG.info("WAL files: {}", Arrays.toString(files));
+ assertEquals(1, files.length);
+ LOG.info("Deleting {}", masterRegionWalDir);
+ // Delete the WAL directory
+ fs.delete(masterRegionWalDir, true);
+
+ // Re-create the MasterRegion and hit the MasterRegion#open() code-path
+ // (rather than bootstrap())
+ super.create();
Review comment:
This call is a bit confusing to me that, why there is a ‘super’. I think
if we change create to a more specific name, we could just call the method
directly, without adding the ‘super’ here?
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/master/region/MasterRegion.java
##########
@@ -227,7 +227,23 @@ private static HRegion open(Configuration conf,
TableDescriptor td, FileSystem f
if (!walFs.exists(replayEditsDir) && !walFs.mkdirs(replayEditsDir)) {
throw new IOException("Failed to create replay directory: " +
replayEditsDir);
}
+
+ // Replay any WALs for the Master Region before opening it.
Path walsDir = new Path(walRootDir, HREGION_LOGDIR_NAME);
+ if (walFs.exists(walsDir)) {
Review comment:
Please add comment here to explain why this could happen. The old
assumption here is that, once the region is created, the directory should be
there.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
