You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/01/17 13:00:50 UTC
[shardingsphere] branch master updated: Add remote debug port for
docker IT (#9065)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 cbae180 Add remote debug port for docker IT (#9065)
cbae180 is described below
commit cbae180d434599b17d60788e3986fe1f01ce4cf8
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Jan 17 21:00:17 2021 +0800
Add remote debug port for docker IT (#9065)
* Resolve problem for utf8 chars cannot encoding
* Resolve problem for utf8 chars cannot encoding
* Resolve problem for utf8 chars cannot encoding
* Add remote debug port for docker IT
---
.../shardingsphere-integration-test-suite/pom.xml | 4 ----
.../src/test/assembly/bin/start.sh | 2 +-
.../src/test/resources/docker/db/docker-compose.yml | 1 +
.../test/resources/docker/dbtbl_with_replica_query/docker-compose.yml | 1 +
.../src/test/resources/docker/replica_query/docker-compose.yml | 1 +
.../src/test/resources/docker/tbl/docker-compose.yml | 1 +
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
index 0ddf89d..400d7eb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
@@ -147,7 +147,6 @@
<configuration>
<composeFile>${project.basedir}/src/test/resources/docker/db/docker-compose.yml</composeFile>
<removeVolumes>true</removeVolumes>
- <removeImages>true</removeImages>
</configuration>
</execution>
@@ -171,7 +170,6 @@
<configuration>
<composeFile>${project.basedir}/src/test/resources/docker/tbl/docker-compose.yml</composeFile>
<removeVolumes>true</removeVolumes>
- <removeImages>true</removeImages>
</configuration>
</execution>
@@ -195,7 +193,6 @@
<configuration>
<composeFile>${project.basedir}/src/test/resources/docker/replica_query/docker-compose.yml</composeFile>
<removeVolumes>true</removeVolumes>
- <removeImages>true</removeImages>
</configuration>
</execution>
@@ -219,7 +216,6 @@
<configuration>
<composeFile>${project.basedir}/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml</composeFile>
<removeVolumes>true</removeVolumes>
- <removeImages>true</removeImages>
</configuration>
</execution>
</executions>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh
index a574dba..67f2549 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/assembly/bin/start.sh
@@ -32,7 +32,7 @@ EXT_LIB=${DEPLOY_DIR}/ext-lib
CLASS_PATH=.:${DEPLOY_DIR}/lib/*:${EXT_LIB}/*
-JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
+JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=3308"
JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn1g -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml
index 11a794f..2d7ded4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml
@@ -40,6 +40,7 @@ services:
container_name: db-shardingsphere-proxy
ports:
- "33070:3307"
+ - "33080:3308"
links:
- "mysql:mysql.db.host"
# - "zookeeper:zk"
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml
index 83af4da..b331494 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml
@@ -40,6 +40,7 @@ services:
container_name: dbtbl-with-replica-query-shardingsphere-proxy
ports:
- "33370:3307"
+ - "33380:3308"
links:
- "mysql:mysql.dbtbl-with-replica-query.host"
# - "zookeeper:zk"
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml
index 948d275..d9c9cfb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml
@@ -40,6 +40,7 @@ services:
container_name: replica-query-shardingsphere-proxy
ports:
- "33270:3307"
+ - "33280:3308"
links:
- "mysql:mysql.replica-query.host"
# - "zookeeper:zk"
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml
index 1f91908..a4e400f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml
@@ -40,6 +40,7 @@ services:
container_name: tbl-shardingsphere-proxy
ports:
- "33170:3307"
+ - "33180:3308"
links:
- "mysql:mysql.tbl.host"
# - "zookeeper:zk"