From 6af11bdf18f580ad5a9b27b97c9a070fecbaf4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Miller=20=28=E9=94=BA=E4=BF=8A=29?= Date: Sun, 3 Apr 2022 10:32:23 +0800 Subject: [PATCH] build($Consul): update the name of MySQL data source use source/replica terms for MySQL clusters, instead of master/slave current architecture is only one MySQL server for writing (source), multiple MySQL replicas for reading (replica(s), one or more). BREAKING CHANGE: use source/replica terms for MySQL clusters, instead of master/slave [skip ci] --- .../application@development-docker/data.yml | 10 +++++----- .../application@development-local/data.yml | 10 +++++----- .../shardingsphere/application@production/data.yml | 10 +++++----- .../shardingsphere/application@stage/data.yml | 10 +++++----- .../shardingsphere/application@test/data.yml | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-docker/data.yml b/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-docker/data.yml index 75731e2e..0cd6ba8e 100644 --- a/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-docker/data.yml +++ b/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-docker/data.yml @@ -3,13 +3,13 @@ spring: props: sql-show: false datasource: - master0: + source: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - slave0: + replica-1: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true @@ -21,15 +21,15 @@ spring: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - names: master0,slave0,quartz + names: source,replica-1,quartz rules: readwrite-splitting: data-sources: readwrite-data-sources: type: Static props: - write-data-source-name: master0 - read-data-source-names: slave0 + write-data-source-name: source + read-data-source-names: replica-1 load-balancer-name: readwrite-load-balancer load-balancers: readwrite-load-balancer: diff --git a/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-local/data.yml b/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-local/data.yml index a290c509..01b050f6 100644 --- a/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-local/data.yml +++ b/docker/configuration/consul-yaml-configuration/shardingsphere/application@development-local/data.yml @@ -3,13 +3,13 @@ spring: props: sql-show: true datasource: - master0: + source: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - slave0: + replica-1: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3307/muscle_and_fitness_0?useSSL=true&useUnicode=true @@ -21,15 +21,15 @@ spring: url: jdbc:mysql://localhost:3306/QUARTZ_DB?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - names: master0,slave0,quartz + names: source,replica-1,quartz rules: readwrite-splitting: data-sources: readwrite-data-sources: type: Static props: - write-data-source-name: master0 - read-data-source-names: slave0 + write-data-source-name: source + read-data-source-names: replica-1 load-balancer-name: readwrite-load-balancer load-balancers: readwrite-load-balancer: diff --git a/docker/configuration/consul-yaml-configuration/shardingsphere/application@production/data.yml b/docker/configuration/consul-yaml-configuration/shardingsphere/application@production/data.yml index 75731e2e..0cd6ba8e 100644 --- a/docker/configuration/consul-yaml-configuration/shardingsphere/application@production/data.yml +++ b/docker/configuration/consul-yaml-configuration/shardingsphere/application@production/data.yml @@ -3,13 +3,13 @@ spring: props: sql-show: false datasource: - master0: + source: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - slave0: + replica-1: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true @@ -21,15 +21,15 @@ spring: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - names: master0,slave0,quartz + names: source,replica-1,quartz rules: readwrite-splitting: data-sources: readwrite-data-sources: type: Static props: - write-data-source-name: master0 - read-data-source-names: slave0 + write-data-source-name: source + read-data-source-names: replica-1 load-balancer-name: readwrite-load-balancer load-balancers: readwrite-load-balancer: diff --git a/docker/configuration/consul-yaml-configuration/shardingsphere/application@stage/data.yml b/docker/configuration/consul-yaml-configuration/shardingsphere/application@stage/data.yml index 75731e2e..0cd6ba8e 100644 --- a/docker/configuration/consul-yaml-configuration/shardingsphere/application@stage/data.yml +++ b/docker/configuration/consul-yaml-configuration/shardingsphere/application@stage/data.yml @@ -3,13 +3,13 @@ spring: props: sql-show: false datasource: - master0: + source: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - slave0: + replica-1: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true @@ -21,15 +21,15 @@ spring: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - names: master0,slave0,quartz + names: source,replica-1,quartz rules: readwrite-splitting: data-sources: readwrite-data-sources: type: Static props: - write-data-source-name: master0 - read-data-source-names: slave0 + write-data-source-name: source + read-data-source-names: replica-1 load-balancer-name: readwrite-load-balancer load-balancers: readwrite-load-balancer: diff --git a/docker/configuration/consul-yaml-configuration/shardingsphere/application@test/data.yml b/docker/configuration/consul-yaml-configuration/shardingsphere/application@test/data.yml index 75731e2e..0cd6ba8e 100644 --- a/docker/configuration/consul-yaml-configuration/shardingsphere/application@test/data.yml +++ b/docker/configuration/consul-yaml-configuration/shardingsphere/application@test/data.yml @@ -3,13 +3,13 @@ spring: props: sql-show: false datasource: - master0: + source: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - slave0: + replica-1: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true @@ -21,15 +21,15 @@ spring: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness_0?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql - names: master0,slave0,quartz + names: source,replica-1,quartz rules: readwrite-splitting: data-sources: readwrite-data-sources: type: Static props: - write-data-source-name: master0 - read-data-source-names: slave0 + write-data-source-name: source + read-data-source-names: replica-1 load-balancer-name: readwrite-load-balancer load-balancers: readwrite-load-balancer: