This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6a9602f6acf Add governance param to show processlist e2e (#24925)
6a9602f6acf is described below
commit 6a9602f6acfb91f59205df3c3ddf75b8f6b685d7
Author: Chuxin Chen <[email protected]>
AuthorDate: Fri Mar 31 18:44:35 2023 +0800
Add governance param to show processlist e2e (#24925)
---
.../composer/ClusterShowProcessListContainerComposer.java | 7 ++++---
.../test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java | 4 +++-
.../test/e2e/showprocesslist/env/ShowProcessListEnvironment.java | 3 +++
.../showprocesslist/parameter/ShowProcessListTestParameter.java | 2 ++
.../env/common/cluster/proxy/{ => zookeeper}/conf/logback.xml | 0
.../env/common/cluster/proxy/{ => zookeeper}/conf/server.yaml | 0
.../showprocesslist/src/test/resources/env/it-env.properties | 2 ++
7 files changed, 14 insertions(+), 4 deletions(-)
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index 650e6318d2e..d2716e8bd8e 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -57,7 +57,7 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
StorageContainer storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(testParam.getDatabaseType(),
"", testParam.getScenario(),
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType())));
AdaptorContainerConfiguration containerConfig = new
AdaptorContainerConfiguration(testParam.getScenario(),
- getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode()),
AdapterContainerUtils.getAdapterContainerImage());
+ getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode(),
testParam.getGovernanceCenter()),
AdapterContainerUtils.getAdapterContainerImage());
jdbcContainer = AdapterContainerFactory.newInstance(
AdapterMode.valueOf(testParam.getRunMode().toUpperCase()),
AdapterType.JDBC, testParam.getDatabaseType(), storageContainer,
testParam.getScenario(), containerConfig);
proxyContainer = AdapterContainerFactory.newInstance(
@@ -72,9 +72,10 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
containers.registerContainer(jdbcContainer);
}
- private Map<String, String> getMountedResources(final String scenario,
final DatabaseType databaseType, final String runMode) {
+ private Map<String, String> getMountedResources(final String scenario,
final DatabaseType databaseType, final String runMode, final String
governanceCenter) {
Map<String, String> result = new HashMap<>(2, 1);
- result.put(isClusterMode(runMode) ? "/env/common/cluster/proxy/conf/"
: "/env/common/standalone/proxy/conf/",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
+ result.put(isClusterMode(runMode) ?
String.format("/env/common/cluster/proxy/%s/conf/",
governanceCenter.toLowerCase())
+ : "/env/common/standalone/proxy/conf/",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
result.put("/env/scenario/" + scenario + "/proxy/conf/" +
databaseType.getType().toLowerCase(),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
return result;
}
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
index 6a3cf827b07..f20a1f4fdd1 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
@@ -119,7 +119,9 @@ class ShowProcessListE2EIT {
Collection<Arguments> result = new LinkedList<>();
for (String each : ENV.getScenarios()) {
for (String runMode : ENV.getRunModes()) {
- result.add(Arguments.of(new
ShowProcessListTestParameter(new MySQLDatabaseType(), each, runMode)));
+ for (String governanceType : ENV.getGovernanceCenters()) {
+ result.add(Arguments.of(new
ShowProcessListTestParameter(new MySQLDatabaseType(), each, runMode,
governanceType)));
+ }
}
}
return result.stream();
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
index 395ab3a7550..ec2c5618a35 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
@@ -41,11 +41,14 @@ public final class ShowProcessListEnvironment {
private final Collection<String> scenarios;
+ private final Collection<String> governanceCenters;
+
private ShowProcessListEnvironment() {
props = loadProperties();
runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.run.modes"));
itEnvType =
ShowProcessListEnvTypeEnum.valueOf(props.getProperty("it.env.type",
ShowProcessListEnvTypeEnum.NONE.name()).toUpperCase());
scenarios = getScenarios(props);
+ governanceCenters =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.governance.centers"));
}
/**
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListTestParameter.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListTestParameter.java
index a766d731442..18d49c70799 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListTestParameter.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListTestParameter.java
@@ -32,4 +32,6 @@ public final class ShowProcessListTestParameter {
private final String scenario;
private final String runMode;
+
+ private final String governanceCenter;
}
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/conf/logback.xml
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/logback.xml
similarity index 100%
rename from
test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/conf/logback.xml
rename to
test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/logback.xml
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/server.yaml
similarity index 100%
rename from
test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/conf/server.yaml
rename to
test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/server.yaml
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/it-env.properties
b/test/e2e/operation/showprocesslist/src/test/resources/env/it-env.properties
index d21a0b45a8d..bd245c0ee1e 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/it-env.properties
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/it-env.properties
@@ -21,3 +21,5 @@ it.env.type=NONE
it.scenarios=cluster_jdbc_proxy
#it.run.modes=Standalone,Cluster
it.run.modes=Standalone,Cluster
+#it.governance.center=Zookeeper
+it.governance.centers=Zookeeper
