[hbase] branch branch-2 updated: HBASE-21843 RegionGroupingProvider breaks the meta wal file name pattern which may cause data loss for meta region

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new c5b80ea  HBASE-21843 RegionGroupingProvider breaks the meta wal file name pattern which may cause data loss for meta region
c5b80ea is described below

commit c5b80ea2d4af5d89880dccae474db611ad670824
Author: zhangduo <zh...@apache.org>
AuthorDate: Thu Feb 7 08:44:21 2019 +0800

    HBASE-21843 RegionGroupingProvider breaks the meta wal file name pattern which may cause data loss for meta region
---
 .../hadoop/hbase/regionserver/HRegionServer.java   |  2 +-
 .../hadoop/hbase/wal/RegionGroupingProvider.java   | 20 +++---
 .../hadoop/hbase/wal/TestWrongMetaWALFileName.java | 73 ++++++++++++++++++++++
 3 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 5443a8c..371915f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -2889,7 +2889,7 @@ public class HRegionServer extends HasThread implements
   /**
    * @return Return the walFs.
    */
-  protected FileSystem getWALFileSystem() {
+  public FileSystem getWALFileSystem() {
     return walFs;
   }
 
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java
index 28817e9..b3ee56c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java
@@ -142,15 +142,21 @@ public class RegionGroupingProvider implements WALProvider {
       throw new IllegalStateException("WALProvider.init should only be called once.");
     }
     this.factory = factory;
-    StringBuilder sb = new StringBuilder().append(factory.factoryId);
-    if (providerId != null) {
-      if (providerId.startsWith(WAL_FILE_NAME_DELIMITER)) {
-        sb.append(providerId);
-      } else {
-        sb.append(WAL_FILE_NAME_DELIMITER).append(providerId);
+
+    if (META_WAL_PROVIDER_ID.equals(providerId)) {
+      // do not change the provider id if it is for meta
+      this.providerId = providerId;
+    } else {
+      StringBuilder sb = new StringBuilder().append(factory.factoryId);
+      if (providerId != null) {
+        if (providerId.startsWith(WAL_FILE_NAME_DELIMITER)) {
+          sb.append(providerId);
+        } else {
+          sb.append(WAL_FILE_NAME_DELIMITER).append(providerId);
+        }
       }
+      this.providerId = sb.toString();
     }
-    this.providerId = sb.toString();
     this.strategy = getStrategy(conf, REGION_GROUPING_STRATEGY, DEFAULT_REGION_GROUPING_STRATEGY);
     this.providerClass = factory.getProviderClass(DELEGATE_PROVIDER, DEFAULT_DELEGATE_PROVIDER);
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWrongMetaWALFileName.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWrongMetaWALFileName.java
new file mode 100644
index 0000000..f16d221
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWrongMetaWALFileName.java
@@ -0,0 +1,73 @@
+/**
+ * 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.wal;
+
+import static org.junit.Assert.assertTrue;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.regionserver.HRegionServer;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.RegionServerTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+/**
+ * Testcase for HBASE-21843. Used to confirm that we use the correct name for meta wal file when
+ * using {@link RegionGroupingProvider}.
+ */
+@Category({ RegionServerTests.class, MediumTests.class })
+public class TestWrongMetaWALFileName {
+
+  @ClassRule
+  public static final HBaseClassTestRule CLASS_RULE =
+    HBaseClassTestRule.forClass(TestWrongMetaWALFileName.class);
+
+  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+
+  @BeforeClass
+  public static void setUp() throws Exception {
+    UTIL.getConfiguration().set(WALFactory.WAL_PROVIDER, WALFactory.Providers.multiwal.name());
+    UTIL.startMiniCluster(1);
+  }
+
+  @AfterClass
+  public static void tearDown() throws Exception {
+    UTIL.shutdownMiniCluster();
+  }
+
+  @Test
+  public void test() throws Exception {
+    // create a table so that we will write some edits to meta
+    TableName tableName = TableName.valueOf("whatever");
+    UTIL.createTable(tableName, Bytes.toBytes("family"));
+    UTIL.waitTableAvailable(tableName);
+    HRegionServer rs = UTIL.getMiniHBaseCluster().getRegionServer(0);
+    Path walDir = new Path(rs.getWALRootDir(),
+      AbstractFSWALProvider.getWALDirectoryName(rs.getServerName().toString()));
+    // we should have meta wal files.
+    assertTrue(
+      rs.getWALFileSystem().listStatus(walDir, AbstractFSWALProvider::isMetaFile).length > 0);
+  }
+}