This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 f0f832b37de Add force start E2E of ShardingSphere-proxy (#28251)
f0f832b37de is described below
commit f0f832b37def6bd0ceb64d83367022f25eab88a6
Author: ZhangCheng <[email protected]>
AuthorDate: Fri Aug 25 14:44:21 2023 +0800
Add force start E2E of ShardingSphere-proxy (#28251)
* Add force start E2E of ShardingSphere-proxy
* e2e
* e2e
---
distribution/proxy/src/main/resources/bin/start.sh | 4 +-
.../config/AdaptorContainerConfiguration.java | 2 +
.../ProxyClusterContainerConfigurationFactory.java | 2 +-
.../impl/ShardingSphereProxyClusterContainer.java | 4 ++
test/e2e/fixture/Dockerfile | 2 +-
test/e2e/fixture/src/test/assembly/bin/start.sh | 64 ++++++++++++++++++++--
...eProxyClusterContainerConfigurationFactory.java | 2 +-
.../ClusterShowProcessListContainerComposer.java | 3 +-
.../ProxyClusterContainerConfigurationFactory.java | 3 +-
.../data/actual/init-sql/mysql/01-actual-init.sql | 2 +
.../actual/init-sql/opengauss/01-actual-init.sql | 2 +
.../actual/init-sql/postgresql/01-actual-init.sql | 2 +
.../conf/mysql/config-readwrite-splitting.yaml | 10 ++++
.../conf/opengauss/config-readwrite-splitting.yaml | 10 ++++
.../postgresql/config-readwrite-splitting.yaml | 10 ++++
.../ProxyClusterContainerConfigurationFactory.java | 2 +-
...oxyStandaloneContainerConfigurationFactory.java | 2 +-
17 files changed, 112 insertions(+), 14 deletions(-)
diff --git a/distribution/proxy/src/main/resources/bin/start.sh
b/distribution/proxy/src/main/resources/bin/start.sh
index 88f2c86c643..b75111486f9 100644
--- a/distribution/proxy/src/main/resources/bin/start.sh
+++ b/distribution/proxy/src/main/resources/bin/start.sh
@@ -111,7 +111,7 @@ print_usage() {
echo " port: proxy listen port, default is 3307"
echo " config_dir: proxy config directory, default is 'conf'"
echo ""
- echo "start.sh [-a addresses] [-p port] [-c /path/to/conf]"
+ echo "start.sh [-a addresses] [-p port] [-c /path/to/conf] [-f] [-g] [-s
/path/to/socket]"
echo "The options are unordered."
echo "-a Bind addresses, can be IPv4, IPv6, hostname. In"
echo " case more than one address is specified in a"
@@ -173,7 +173,7 @@ if [ $# == 0 ]; then
fi
if [[ $1 == -a ]] || [[ $1 == -p ]] || [[ $1 == -c ]] || [[ $1 == -f ]] || [[
$1 == -s ]]; then
- while getopts ":a:p:c:f:s:" opt
+ while getopts ":a:p:c:fs:" opt
do
case $opt in
a)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
index fb2175d1746..f49ce3b3e6f 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
@@ -34,4 +34,6 @@ public final class AdaptorContainerConfiguration {
private final Map<String, String> mountedResources;
private final String adapterContainerImage;
+
+ private final String containerCommand;
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
index 77cd0254c6e..5cf7cecc50b 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
@@ -37,7 +37,7 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance() {
- return new AdaptorContainerConfiguration("", getMountedResources(),
AdapterContainerUtils.getAdapterContainerImage());
+ return new AdaptorContainerConfiguration("", getMountedResources(),
AdapterContainerUtils.getAdapterContainerImage(), "");
}
private static Map<String, String> getMountedResources() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index 9dff96e80a5..c4971bd97ec 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
+import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
@@ -64,6 +65,9 @@ public final class ShardingSphereProxyClusterContainer
extends DockerITContainer
@Override
protected void configure() {
+ if (!Strings.isNullOrEmpty(config.getContainerCommand())) {
+ setCommand(config.getContainerCommand());
+ }
withExposedPorts(3307, 33071, 3308);
mountConfigurationFiles();
setWaitStrategy(new JdbcConnectionWaitStrategy(() ->
DriverManager.getConnection(DataSourceEnvironment.getURL(databaseType,
diff --git a/test/e2e/fixture/Dockerfile b/test/e2e/fixture/Dockerfile
index 1a03bec97a3..1c534d337cf 100644
--- a/test/e2e/fixture/Dockerfile
+++ b/test/e2e/fixture/Dockerfile
@@ -30,4 +30,4 @@ COPY --from=prepare /opt/shardingsphere-proxy
/opt/shardingsphere-proxy
EXPOSE 3307
EXPOSE 3308
-CMD /opt/shardingsphere-proxy/bin/start.sh
+ENTRYPOINT ["/opt/shardingsphere-proxy/bin/start.sh"]
diff --git a/test/e2e/fixture/src/test/assembly/bin/start.sh
b/test/e2e/fixture/src/test/assembly/bin/start.sh
index a1cb85fc0bb..e817a354f17 100755
--- a/test/e2e/fixture/src/test/assembly/bin/start.sh
+++ b/test/e2e/fixture/src/test/assembly/bin/start.sh
@@ -37,10 +37,17 @@ JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn1g -Xss1m
-XX:+DisableExplicitGC -XX:+
MAIN_CLASS=org.apache.shardingsphere.proxy.Bootstrap
+unset -v PORT
+unset -v ADDRESSES
+unset -v CONF_PATH
+unset -v FORCE
+unset -v SOCKET_FILE
+
print_usage() {
echo "usage: start.sh [port] [config_dir]"
echo " port: proxy listen port, default is 3307"
echo " config_dir: proxy config directory, default is conf"
+ echo "-f Force start ShardingSphere-Proxy"
exit 0
}
@@ -54,19 +61,66 @@ if [ $# == 0 ]; then
CLASS_PATH=${DEPLOY_DIR}/conf:${CLASS_PATH}
fi
-if [ $# == 1 ]; then
- MAIN_CLASS=${MAIN_CLASS}" "$1
+if [[ $1 == -a ]] || [[ $1 == -p ]] || [[ $1 == -c ]] || [[ $1 == -f ]] || [[
$1 == -s ]]; then
+ while getopts ":a:p:c:fs:" opt
+ do
+ case $opt in
+ a)
+ echo "The address is $OPTARG"
+ ADDRESSES=$OPTARG;;
+ p)
+ echo "The port is $OPTARG"
+ PORT=$OPTARG;;
+ c)
+ echo "The configuration path is $OPTARG"
+ CONF_PATH=$OPTARG;;
+ f)
+ echo "The force param is true"
+ FORCE=true;;
+ s)
+ echo "The socket file is $OPTARG"
+ SOCKET_FILE=$OPTARG;;
+ ?)
+ print_usage;;
+ esac
+ done
+
+elif [ $# == 1 ]; then
+ PORT=$1
echo "The port is $1"
- CLASS_PATH=${DEPLOY_DIR}/conf:${CLASS_PATH}
fi
if [ $# == 2 ]; then
- MAIN_CLASS=${MAIN_CLASS}" "$1" "$2
+ PORT=$1
+ CONF_PATH=$2
echo "The port is $1"
echo "The configuration path is $DEPLOY_DIR/$2"
- CLASS_PATH=${DEPLOY_DIR}/$2:${CLASS_PATH}
fi
+if [ -z "$CONF_PATH" ]; then
+ CONF_PATH=${DEPLOY_DIR}/conf
+fi
+
+if [ -z "$PORT" ]; then
+ PORT=-1
+fi
+
+if [ -z "$ADDRESSES" ]; then
+ ADDRESSES="0.0.0.0"
+fi
+
+if [ -z "$FORCE" ]; then
+ FORCE=false
+fi
+
+if [ "$SOCKET_FILE" ]; then
+ ADDRESSES="${ADDRESSES},${SOCKET_FILE}"
+fi
+
+CLASS_PATH=${CONF_PATH}:${CLASS_PATH}
+MAIN_CLASS="${MAIN_CLASS} ${PORT} ${CONF_PATH} ${ADDRESSES} ${FORCE}"
+
echo "The classpath is ${CLASS_PATH}"
+echo "main class ${MAIN_CLASS}"
exec java ${JAVA_OPTS} ${JAVA_MEM_OPTS} -classpath ${CLASS_PATH} ${MAIN_CLASS}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
index 9463ae506b2..45edd71b096 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
@@ -43,7 +43,7 @@ public final class
PipelineProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final DatabaseType
databaseType) {
- return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType),
AdapterContainerUtils.getAdapterContainerImage());
+ return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType),
AdapterContainerUtils.getAdapterContainerImage(), "");
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
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 6183f56bb1a..253eab64891 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,8 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
StorageContainer storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(testParam.getDatabaseType(),
"",
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType(),
testParam.getScenario())));
AdaptorContainerConfiguration containerConfig = new
AdaptorContainerConfiguration(testParam.getScenario(),
- getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode(),
testParam.getGovernanceCenter()),
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(
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
index e30feb00a7e..c5aaabbc1ee 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
@@ -43,7 +43,8 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
- return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage());
+ String containerCommand = "readwrite-splitting".equals(scenario) ?
"-f" : "";
+ return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage(), containerCommand);
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/mysql/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/mysql/01-actual-init.sql
index e70927b83fc..989fd8ffcea 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/mysql/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/mysql/01-actual-init.sql
@@ -21,10 +21,12 @@ SET character_set_server='utf8';
DROP DATABASE IF EXISTS write_ds;
DROP DATABASE IF EXISTS read_ds_0;
DROP DATABASE IF EXISTS read_ds_1;
+DROP DATABASE IF EXISTS read_ds_error;
CREATE DATABASE write_ds;
CREATE DATABASE read_ds_0;
CREATE DATABASE read_ds_1;
+CREATE DATABASE read_ds_error;
CREATE TABLE write_ds.`t_order` (`order_id` INT PRIMARY KEY, `user_id` INT NOT
NULL, `status` VARCHAR(45) NULL);
CREATE TABLE write_ds.`t_order_item` (`item_id` INT PRIMARY KEY, `order_id`
int NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT NULL);
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/opengauss/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/opengauss/01-actual-init.sql
index 4d3b9cf4487..62a48f4f166 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/opengauss/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -18,10 +18,12 @@
DROP DATABASE IF EXISTS write_ds;
DROP DATABASE IF EXISTS read_ds_0;
DROP DATABASE IF EXISTS read_ds_1;
+DROP DATABASE IF EXISTS read_ds_error;
CREATE DATABASE write_ds;
CREATE DATABASE read_ds_0;
CREATE DATABASE read_ds_1;
+CREATE DATABASE read_ds_error;
GRANT ALL PRIVILEGES ON DATABASE write_ds TO test_user;
GRANT ALL PRIVILEGES ON DATABASE read_ds_0 TO test_user;
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/postgresql/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/postgresql/01-actual-init.sql
index 4d3b9cf4487..62a48f4f166 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/postgresql/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/data/actual/init-sql/postgresql/01-actual-init.sql
@@ -18,10 +18,12 @@
DROP DATABASE IF EXISTS write_ds;
DROP DATABASE IF EXISTS read_ds_0;
DROP DATABASE IF EXISTS read_ds_1;
+DROP DATABASE IF EXISTS read_ds_error;
CREATE DATABASE write_ds;
CREATE DATABASE read_ds_0;
CREATE DATABASE read_ds_1;
+CREATE DATABASE read_ds_error;
GRANT ALL PRIVILEGES ON DATABASE write_ds TO test_user;
GRANT ALL PRIVILEGES ON DATABASE read_ds_0 TO test_user;
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/config-readwrite-splitting.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/config-readwrite-splitting.yaml
index 66b0026b5ce..c4e830ceb66 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/config-readwrite-splitting.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/config-readwrite-splitting.yaml
@@ -50,6 +50,16 @@ dataSources:
maxLifetimeMilliseconds: 1800000
maxPoolSize: 2
minPoolSize: 2
+ read_ds_error:
+ url:
jdbc:mysql://mysql.readwrite-splitting.host:3306/read_ds_error?serverTimezone=UTC&useSSL=false&characterEncoding=utf-8
+ username: test_user
+ password: wrong_password
+ connectionTimeoutMilliseconds: 5000
+ idleTimeoutMilliseconds: 60000
+ maxLifetimeMilliseconds: 1800000
+ maxPoolSize: 1
+ minPoolSize: 1
+
rules:
- !SINGLE
tables:
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/config-readwrite-splitting.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/config-readwrite-splitting.yaml
index 9d3151e0e5d..585ad175f8f 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/config-readwrite-splitting.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/config-readwrite-splitting.yaml
@@ -50,6 +50,16 @@ dataSources:
maxLifetimeMilliseconds: 1800000
maxPoolSize: 2
minPoolSize: 2
+ read_ds_error:
+ url: jdbc:opengauss://opengauss.default.host:5432/read_ds_error
+ username: test_user
+ password: wrong_password
+ connectionTimeoutMilliseconds: 5000
+ idleTimeoutMilliseconds: 60000
+ maxLifetimeMilliseconds: 1800000
+ maxPoolSize: 1
+ minPoolSize: 1
+
rules:
- !SINGLE
tables:
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml
index 0b1319f3035..961509c274f 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/config-readwrite-splitting.yaml
@@ -50,6 +50,16 @@ dataSources:
maxLifetimeMilliseconds: 1800000
maxPoolSize: 2
minPoolSize: 2
+ read_ds_error:
+ url: jdbc:postgresql://postgresql.default.host:5432/read_ds_error
+ username: test_user
+ password: wrong_password
+ connectionTimeoutMilliseconds: 5000
+ idleTimeoutMilliseconds: 60000
+ maxLifetimeMilliseconds: 1800000
+ maxPoolSize: 1
+ minPoolSize: 1
+
rules:
- !SINGLE
tables:
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
index fde49e59bf4..3043d483538 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
@@ -42,7 +42,7 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType, final String adapterContainerImage) {
- return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType), adapterContainerImage);
+ return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType), adapterContainerImage, "");
}
private static Map<String, String> getMountedResources(final String
scenario, final DatabaseType databaseType) {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
index f34859e4a13..ccd889e3808 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
@@ -42,7 +42,7 @@ public final class
ProxyStandaloneContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
- return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage());
+ return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage(), "");
}
private static Map<String, String> getMountedResources(final String
scenario, final DatabaseType databaseType) {
