HBASE-26167 Allow users to not start zookeeper and dfs cluster when u…

…sing TestingHBaseCluster (apache#4534) Co-authored-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Yu Li <liyu@apache.org>
SiCheng-Zheng · Jun 15, 2022 · 7fc1674 · 7fc1674
1 parent 1833997
commit 7fc1674
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 3 deletions.
diff --git a/...e-testing-util/src/main/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterImpl.java b/...e-testing-util/src/main/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterImpl.java
@@ -19,12 +19,15 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.StartTestingClusterOption;
 import org.apache.hadoop.hbase.client.RegionInfo;
@@ -46,6 +49,10 @@ class TestingHBaseClusterImpl implements TestingHBaseCluster {
 
   private final StartTestingClusterOption option;
 
+  private final String externalDfsUri;
+
+  private final String externalZkConnectString;
+
   private final ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder()
     .setNameFormat(getClass().getSuperclass() + "-%d").setDaemon(true).build());
 
@@ -56,6 +63,8 @@ class TestingHBaseClusterImpl implements TestingHBaseCluster {
   TestingHBaseClusterImpl(TestingHBaseClusterOption option) {
     this.util = new HBaseTestingUtil(option.conf());
     this.option = option.convert();
+    this.externalDfsUri = option.getExternalDfsUri();
+    this.externalZkConnectString = option.getExternalZkConnectString();
   }
 
   @Override
@@ -137,7 +146,20 @@ public void startHBaseCluster() throws Exception {
   @Override
   public void start() throws Exception {
     Preconditions.checkState(!miniClusterRunning, "Cluster has already been started");
-    util.startMiniCluster(option);
+    if (externalZkConnectString == null) {
+      util.startMiniZKCluster();
+    } else {
+      Configuration conf = util.getConfiguration();
+      conf.set(HConstants.ZOOKEEPER_QUORUM, externalZkConnectString);
+      conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/" + UUID.randomUUID().toString());
+    }
+    if (externalDfsUri == null) {
+      util.startMiniDFSCluster(option.getNumDataNodes(), option.getDataNodeHosts());
+    } else {
+      Configuration conf = util.getConfiguration();
+      conf.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY, externalDfsUri);
+    }
+    util.startMiniHBaseCluster(option);
     miniClusterRunning = true;
     miniHBaseClusterRunning = true;
   }

diff --git a/...testing-util/src/main/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterOption.java b/...testing-util/src/main/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterOption.java
@@ -98,12 +98,17 @@ public final class TestingHBaseClusterOption {
    */
   private final boolean createWALDir;
 
+  private final String externalDfsUri;
+
+  private final String externalZkConnectString;
+
   /**
    * Private constructor. Use {@link Builder#build()}.
    */
   private TestingHBaseClusterOption(Configuration conf, int numMasters, int numAlwaysStandByMasters,
     int numRegionServers, List<Integer> rsPorts, int numDataNodes, String[] dataNodeHosts,
-    int numZkServers, boolean createRootDir, boolean createWALDir) {
+    int numZkServers, boolean createRootDir, boolean createWALDir, String externalDfsUri,
+    String externalZkConnectString) {
     this.conf = conf;
     this.numMasters = numMasters;
     this.numAlwaysStandByMasters = numAlwaysStandByMasters;
@@ -114,6 +119,8 @@ private TestingHBaseClusterOption(Configuration conf, int numMasters, int numAlw
     this.numZkServers = numZkServers;
     this.createRootDir = createRootDir;
     this.createWALDir = createWALDir;
+    this.externalDfsUri = externalDfsUri;
+    this.externalZkConnectString = externalZkConnectString;
   }
 
   public Configuration conf() {
@@ -156,6 +163,14 @@ public boolean isCreateWALDir() {
     return createWALDir;
   }
 
+  public String getExternalDfsUri() {
+    return externalDfsUri;
+  }
+
+  public String getExternalZkConnectString() {
+    return externalZkConnectString;
+  }
+
   @Override
   public String toString() {
     return "StartMiniClusterOption{" + "numMasters=" + numMasters + ", numRegionServers="
@@ -197,6 +212,8 @@ public static final class Builder {
     private int numZkServers = 1;
     private boolean createRootDir = false;
     private boolean createWALDir = false;
+    private String externalDfsUri = null;
+    private String externalZkConnectString = null;
 
     private Builder() {
     }
@@ -207,7 +224,7 @@ public TestingHBaseClusterOption build() {
       }
       return new TestingHBaseClusterOption(conf, numMasters, numAlwaysStandByMasters,
         numRegionServers, rsPorts, numDataNodes, dataNodeHosts, numZkServers, createRootDir,
-        createWALDir);
+        createWALDir, externalDfsUri, externalZkConnectString);
     }
 
     public Builder conf(Configuration conf) {
@@ -259,5 +276,15 @@ public Builder createWALDir(boolean createWALDir) {
       this.createWALDir = createWALDir;
       return this;
     }
+
+    public Builder useExternalDfs(String uri) {
+      this.externalDfsUri = uri;
+      return this;
+    }
+
+    public Builder useExternalZooKeeper(String connectString) {
+      this.externalZkConnectString = connectString;
+      return this;
+    }
   }
 }
diff --git a/...test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java b/...test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java
@@ -0,0 +1,58 @@
+/*
+ * 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.testing;
+
+import static org.junit.Assert.assertNotEquals;
+
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.junit.ClassRule;
+import org.junit.experimental.categories.Category;
+
+@Category({ MiscTests.class, LargeTests.class })
+public class TestTestingHBaseClusterReplicationShareDfs
+  extends TestingHBaseClusterReplicationTestBase {
+
+  @ClassRule
+  public static final HBaseClassTestRule CLASS_RULE =
+    HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationShareDfs.class);
+
+  private HBaseTestingUtil util = new HBaseTestingUtil();
+
+  @Override
+  protected void startClusters() throws Exception {
+    util.startMiniDFSCluster(1);
+    String dfsUri = util.getDFSCluster().getFileSystem().getUri().toString();
+    sourceCluster = TestingHBaseCluster
+      .create(TestingHBaseClusterOption.builder().useExternalDfs(dfsUri).build());
+    sourceCluster.start();
+    peerCluster = TestingHBaseCluster
+      .create(TestingHBaseClusterOption.builder().useExternalDfs(dfsUri).build());
+    peerCluster.start();
+    assertNotEquals(sourceCluster.getConf().get(HConstants.HBASE_DIR),
+      peerCluster.getConf().get(HConstants.HBASE_DIR));
+  }
+
+  @Override
+  protected void stopClusters() throws Exception {
+    util.shutdownMiniDFSCluster();
+  }
+}
diff --git a/.../test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java b/.../test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java
@@ -0,0 +1,58 @@
+/*
+ * 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.testing;
+
+import static org.junit.Assert.assertNotEquals;
+
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.junit.ClassRule;
+import org.junit.experimental.categories.Category;
+
+@Category({ MiscTests.class, LargeTests.class })
+public class TestTestingHBaseClusterReplicationShareZk
+  extends TestingHBaseClusterReplicationTestBase {
+
+  @ClassRule
+  public static final HBaseClassTestRule CLASS_RULE =
+    HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationShareZk.class);
+
+  private HBaseTestingUtil util = new HBaseTestingUtil();
+
+  @Override
+  protected void startClusters() throws Exception {
+    util.startMiniZKCluster();
+    String zkConnectString = util.getZkCluster().getAddress().toString();
+    sourceCluster = TestingHBaseCluster
+      .create(TestingHBaseClusterOption.builder().useExternalZooKeeper(zkConnectString).build());
+    sourceCluster.start();
+    peerCluster = TestingHBaseCluster
+      .create(TestingHBaseClusterOption.builder().useExternalZooKeeper(zkConnectString).build());
+    peerCluster.start();
+    assertNotEquals(sourceCluster.getConf().get(HConstants.ZOOKEEPER_ZNODE_PARENT),
+      peerCluster.getConf().get(HConstants.ZOOKEEPER_ZNODE_PARENT));
+  }
+
+  @Override
+  protected void stopClusters() throws Exception {
+    util.shutdownMiniZKCluster();
+  }
+}
diff --git a/...st/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java b/...st/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java
@@ -0,0 +1,63 @@
+/*
+ * 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.testing;
+
+import static org.junit.Assert.assertNotEquals;
+
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.junit.ClassRule;
+import org.junit.experimental.categories.Category;
+
+@Category({ MiscTests.class, LargeTests.class })
+public class TestTestingHBaseClusterReplicationShareZkDfs
+  extends TestingHBaseClusterReplicationTestBase {
+
+  @ClassRule
+  public static final HBaseClassTestRule CLASS_RULE =
+    HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationShareZkDfs.class);
+
+  private HBaseTestingUtil util = new HBaseTestingUtil();
+
+  @Override
+  protected void startClusters() throws Exception {
+    util.startMiniZKCluster();
+    util.startMiniDFSCluster(1);
+    String zkConnectString = util.getZkCluster().getAddress().toString();
+    String dfsUri = util.getDFSCluster().getFileSystem().getUri().toString();
+    sourceCluster = TestingHBaseCluster.create(TestingHBaseClusterOption.builder()
+      .useExternalZooKeeper(zkConnectString).useExternalDfs(dfsUri).build());
+    sourceCluster.start();
+    peerCluster = TestingHBaseCluster.create(TestingHBaseClusterOption.builder()
+      .useExternalZooKeeper(zkConnectString).useExternalDfs(dfsUri).build());
+    peerCluster.start();
+    assertNotEquals(sourceCluster.getConf().get(HConstants.ZOOKEEPER_ZNODE_PARENT),
+      peerCluster.getConf().get(HConstants.ZOOKEEPER_ZNODE_PARENT));
+    assertNotEquals(sourceCluster.getConf().get(HConstants.HBASE_DIR),
+      peerCluster.getConf().get(HConstants.HBASE_DIR));
+  }
+
+  @Override
+  protected void stopClusters() throws Exception {
+    util.shutdownMiniDFSCluster();
+    util.shutdownMiniZKCluster();
+  }
+}
diff --git a/...t/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationTwoClusters.java b/...t/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationTwoClusters.java
@@ -0,0 +1,46 @@
+/*
+ * 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.testing;
+
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.junit.ClassRule;
+import org.junit.experimental.categories.Category;
+
+@Category({ MiscTests.class, LargeTests.class })
+public class TestTestingHBaseClusterReplicationTwoClusters
+  extends TestingHBaseClusterReplicationTestBase {
+
+  @ClassRule
+  public static final HBaseClassTestRule CLASS_RULE =
+    HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationTwoClusters.class);
+
+  @Override
+  protected void startClusters() throws Exception {
+    sourceCluster = TestingHBaseCluster.create(TestingHBaseClusterOption.builder().build());
+    sourceCluster.start();
+    peerCluster = TestingHBaseCluster.create(TestingHBaseClusterOption.builder().build());
+    peerCluster.start();
+  }
+
+  @Override
+  protected void stopClusters() throws Exception {
+  }
+
+}