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/07/14 11:09:53 UTC
[shardingsphere] branch master updated: adjust configuration
(#11329)
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 826e418 adjust configuration (#11329)
826e418 is described below
commit 826e41893a1e86e44b74a6f814e32f43f59b295a
Author: Jieker <ji...@163.com>
AuthorDate: Wed Jul 14 19:09:26 2021 +0800
adjust configuration (#11329)
---
.../storage/impl/PostgreSQLContainer.java | 3 +--
.../docker/db/postgresql/docker-compose.yml | 2 +-
.../postgresql/docker-compose.yml | 26 ++++++----------------
.../postgresql/docker-compose.yml | 4 ++--
.../docker/encrypt/postgresql/docker-compose.yml | 2 +-
.../postgresql/docker-compose.yml | 2 +-
.../postgresql/docker-compose.yml | 2 +-
.../docker/tbl/postgresql/docker-compose.yml | 2 +-
8 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/PostgreSQLContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/PostgreSQLContainer.java
index 1c6465e..7b4ac77 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/PostgreSQLContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/impl/PostgreSQLContainer.java
@@ -38,11 +38,10 @@ public final class PostgreSQLContainer extends ShardingSphereStorageContainer {
@Override
protected void configure() {
+ withCommand("--max_connections=200");
addEnv("POSTGRES_USER", "root");
addEnv("POSTGRES_PASSWORD", "root");
- addEnv("PG_SYSTEM_MAX_CONNECTIONS", "200");
withInitSQLMapping("/env/" + getParameterizedArray().getScenario() + "/init-sql/postgresql");
- super.configure();
}
@Override
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/docker-compose.yml
index de3b82b..9864dc0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/docker-compose.yml
@@ -21,6 +21,7 @@ services:
postgresql:
image: "postgres:12.6"
container_name: db-postgresql
+ command: [ '--max_connections=200' ]
volumes:
- ../../env/db/init-sql/postgresql:/docker-entrypoint-initdb.d/
ports:
@@ -28,7 +29,6 @@ services:
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: root
- PG_SYSTEM_MAX_CONNECTIONS: 200
# zookeeper:
# image: "zookeeper:3.6.2"
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/docker-compose.yml
index bd77d5a..c9f7757 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/docker-compose.yml
@@ -18,29 +18,17 @@
version: "2.1"
services:
- mysql:
- image: "mysql/mysql-server:5.7"
- container_name: dbtbl-with-readwrite-splitting-mysql
- command: ['--sql_mode=', '--default-authentication-plugin=mysql_native_password']
- volumes:
- - ../../env/dbtbl_with_readwrite_splitting/init-sql/mysql:/docker-entrypoint-initdb.d/
- ports:
- - "33360:3306"
- environment:
- - LANG=C.UTF-8
-
- postgres:
+ postgresql:
image: "postgres:12.6"
container_name: db-postgres
+ command: [ '--max_connections=200' ]
volumes:
- ../../env/db/init-sql/postgresql:/docker-entrypoint-initdb.d/
ports:
- "54323:5432"
environment:
- POSTGRES_USER: postgres
- POSTGRES_PASSWORD: postgres
- # POSTGRES_HOST_AUTH_METHOD: trust
- PG_SYSTEM_MAX_CONNECTIONS: 200
+ POSTGRES_USER: root
+ POSTGRES_PASSWORD: root
# zookeeper:
# image: "zookeeper:3.6.2"
@@ -55,14 +43,14 @@ services:
- "33370:3307"
- "33380:3308"
links:
- - "mysql:mysql.dbtbl_with_readwrite_splitting.host"
+ - "postgresql:postgresql.dbtbl_with_readwrite_splitting.host"
# - "zookeeper:zk"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy/conf
depends_on:
- - mysql
+ - postgresql
environment:
- - WAIT_HOSTS=mysql:3306
+ - WAIT_HOSTS=postgresql:5432
- WAIT_HOSTS_TIMEOUT=300
- WAIT_SLEEP_INTERVAL=5
- WAIT_HOST_CONNECT_TIMEOUT=30
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/docker-compose.yml
index ce37c7c..09cd0f8 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/docker-compose.yml
@@ -21,6 +21,7 @@ services:
postgresql:
image: "postgres:12.6"
container_name: db-postgresql
+ command: [ '--max_connections=200' ]
volumes:
- ../../env/db/init-sql/postgresql:/docker-entrypoint-initdb.d/
ports:
@@ -28,7 +29,6 @@ services:
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: root
- PG_SYSTEM_MAX_CONNECTIONS: 200
# zookeeper:
# image: "zookeeper:3.6.2"
@@ -48,7 +48,7 @@ services:
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy/conf
depends_on:
- - mysql
+ - postgresql
environment:
- WAIT_HOSTS=postgresql:5432
- WAIT_HOSTS_TIMEOUT=300
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/encrypt/postgresql/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/encrypt/postgresql/docker-compose.yml
index 6a94d51..2eb8263 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/encrypt/postgresql/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/encrypt/postgresql/docker-compose.yml
@@ -21,6 +21,7 @@ services:
postgresql:
image: "postgres:12.6"
container_name: db-postgresql
+ command: [ '--max_connections=200' ]
volumes:
- ../../env/db/init-sql/postgresql:/docker-entrypoint-initdb.d/
ports:
@@ -28,7 +29,6 @@ services:
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: root
- PG_SYSTEM_MAX_CONNECTIONS: 200
# zookeeper:
# image: "zookeeper:3.6.2"
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/readwrite_splitting/postgresql/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/readwrite_splitting/postgresql/docker-compose.yml
index 447ac05..f7453fb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/readwrite_splitting/postgresql/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/readwrite_splitting/postgresql/docker-compose.yml
@@ -21,6 +21,7 @@ services:
postgresql:
image: "postgres:12.6"
container_name: db-postgresql
+ command: [ '--max_connections=200' ]
volumes:
- ../../env/db/init-sql/postgresql:/docker-entrypoint-initdb.d/
ports:
@@ -28,7 +29,6 @@ services:
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: root
- PG_SYSTEM_MAX_CONNECTIONS: 200
# zookeeper:
# image: "zookeeper:3.6.2"
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/docker-compose.yml
index bf544c8..e4df428 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/docker-compose.yml
@@ -21,6 +21,7 @@ services:
postgresql:
image: "postgres:12.6"
container_name: db-postgresql
+ command: [ '--max_connections=200' ]
volumes:
- ../../env/db/init-sql/postgresql:/docker-entrypoint-initdb.d/
ports:
@@ -28,7 +29,6 @@ services:
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: root
- PG_SYSTEM_MAX_CONNECTIONS: 200
zookeeper:
image: "zookeeper:3.6.2"
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/postgresql/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/postgresql/docker-compose.yml
index 2f8b6bf..220531e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/postgresql/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/postgresql/docker-compose.yml
@@ -21,6 +21,7 @@ services:
postgresql:
image: "postgres:12.6"
container_name: db-postgresql
+ command: [ '--max_connections=200' ]
volumes:
- ../../env/db/init-sql/postgresql:/docker-entrypoint-initdb.d/
ports:
@@ -28,7 +29,6 @@ services:
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: root
- PG_SYSTEM_MAX_CONNECTIONS: 200
# zookeeper:
# image: "zookeeper:3.6.2"