Skip to content

Commit 1833997

Browse files
committed
Revert "HBASE-26167 Allow users to not start zookeeper and dfs cluster when using TestingHBaseCluster (#4534)"
This reverts commit 11ae720.
1 parent 0299089 commit 1833997

7 files changed

+3
-393
lines changed

hbase-testing-util/src/main/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterImpl.java

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@
1919

2020
import java.util.List;
2121
import java.util.Optional;
22-
import java.util.UUID;
2322
import java.util.concurrent.CompletableFuture;
2423
import java.util.concurrent.ExecutorService;
2524
import java.util.concurrent.Executors;
2625
import java.util.stream.Collectors;
2726
import org.apache.hadoop.conf.Configuration;
28-
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
2927
import org.apache.hadoop.hbase.HBaseTestingUtil;
30-
import org.apache.hadoop.hbase.HConstants;
3128
import org.apache.hadoop.hbase.ServerName;
3229
import org.apache.hadoop.hbase.StartTestingClusterOption;
3330
import org.apache.hadoop.hbase.client.RegionInfo;
@@ -49,10 +46,6 @@ class TestingHBaseClusterImpl implements TestingHBaseCluster {
4946

5047
private final StartTestingClusterOption option;
5148

52-
private final String externalDfsUri;
53-
54-
private final String externalZkConnectString;
55-
5649
private final ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder()
5750
.setNameFormat(getClass().getSuperclass() + "-%d").setDaemon(true).build());
5851

@@ -63,8 +56,6 @@ class TestingHBaseClusterImpl implements TestingHBaseCluster {
6356
TestingHBaseClusterImpl(TestingHBaseClusterOption option) {
6457
this.util = new HBaseTestingUtil(option.conf());
6558
this.option = option.convert();
66-
this.externalDfsUri = option.getExternalDfsUri();
67-
this.externalZkConnectString = option.getExternalZkConnectString();
6859
}
6960

7061
@Override
@@ -146,20 +137,7 @@ public void startHBaseCluster() throws Exception {
146137
@Override
147138
public void start() throws Exception {
148139
Preconditions.checkState(!miniClusterRunning, "Cluster has already been started");
149-
if (externalZkConnectString == null) {
150-
util.startMiniZKCluster();
151-
} else {
152-
Configuration conf = util.getConfiguration();
153-
conf.set(HConstants.ZOOKEEPER_QUORUM, externalZkConnectString);
154-
conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/" + UUID.randomUUID().toString());
155-
}
156-
if (externalDfsUri == null) {
157-
util.startMiniDFSCluster(option.getNumDataNodes(), option.getDataNodeHosts());
158-
} else {
159-
Configuration conf = util.getConfiguration();
160-
conf.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY, externalDfsUri);
161-
}
162-
util.startMiniHBaseCluster(option);
140+
util.startMiniCluster(option);
163141
miniClusterRunning = true;
164142
miniHBaseClusterRunning = true;
165143
}

hbase-testing-util/src/main/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterOption.java

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,12 @@ public final class TestingHBaseClusterOption {
9898
*/
9999
private final boolean createWALDir;
100100

101-
private final String externalDfsUri;
102-
103-
private final String externalZkConnectString;
104-
105101
/**
106102
* Private constructor. Use {@link Builder#build()}.
107103
*/
108104
private TestingHBaseClusterOption(Configuration conf, int numMasters, int numAlwaysStandByMasters,
109105
int numRegionServers, List<Integer> rsPorts, int numDataNodes, String[] dataNodeHosts,
110-
int numZkServers, boolean createRootDir, boolean createWALDir, String externalDfsUri,
111-
String externalZkConnectString) {
106+
int numZkServers, boolean createRootDir, boolean createWALDir) {
112107
this.conf = conf;
113108
this.numMasters = numMasters;
114109
this.numAlwaysStandByMasters = numAlwaysStandByMasters;
@@ -119,8 +114,6 @@ private TestingHBaseClusterOption(Configuration conf, int numMasters, int numAlw
119114
this.numZkServers = numZkServers;
120115
this.createRootDir = createRootDir;
121116
this.createWALDir = createWALDir;
122-
this.externalDfsUri = externalDfsUri;
123-
this.externalZkConnectString = externalZkConnectString;
124117
}
125118

126119
public Configuration conf() {
@@ -163,14 +156,6 @@ public boolean isCreateWALDir() {
163156
return createWALDir;
164157
}
165158

166-
public String getExternalDfsUri() {
167-
return externalDfsUri;
168-
}
169-
170-
public String getExternalZkConnectString() {
171-
return externalZkConnectString;
172-
}
173-
174159
@Override
175160
public String toString() {
176161
return "StartMiniClusterOption{" + "numMasters=" + numMasters + ", numRegionServers="
@@ -212,8 +197,6 @@ public static final class Builder {
212197
private int numZkServers = 1;
213198
private boolean createRootDir = false;
214199
private boolean createWALDir = false;
215-
private String externalDfsUri = null;
216-
private String externalZkConnectString = null;
217200

218201
private Builder() {
219202
}
@@ -224,7 +207,7 @@ public TestingHBaseClusterOption build() {
224207
}
225208
return new TestingHBaseClusterOption(conf, numMasters, numAlwaysStandByMasters,
226209
numRegionServers, rsPorts, numDataNodes, dataNodeHosts, numZkServers, createRootDir,
227-
createWALDir, externalDfsUri, externalZkConnectString);
210+
createWALDir);
228211
}
229212

230213
public Builder conf(Configuration conf) {
@@ -276,15 +259,5 @@ public Builder createWALDir(boolean createWALDir) {
276259
this.createWALDir = createWALDir;
277260
return this;
278261
}
279-
280-
public Builder useExternalDfs(String uri) {
281-
this.externalDfsUri = uri;
282-
return this;
283-
}
284-
285-
public Builder useExternalZooKeeper(String connectString) {
286-
this.externalZkConnectString = connectString;
287-
return this;
288-
}
289262
}
290263
}

hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationTwoClusters.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)