perf($MySQL): upgrade MySQL version to 8.0.26; change master-slave ph…

…rase master -> source slave -> replica From MySQL 8.0.26, new aliases or replacement names are provided for most remaining identifiers that contain the terms “master”, which is changed to “source”; “slave”, which is changed to “replica”; https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-26.html
johnnymillergh · Sep 19, 2021 · 92f932a · 92f932a
1 parent 8442f49
commit 92f932a
Show file tree

Hide file tree

Showing 26 changed files with 96 additions and 84 deletions.
diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/src/main/resources/application-development-docker.yml
@@ -6,18 +6,18 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
-          url: jdbc:mysql://maf-mysql-server-master:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        source_1:
+          url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
-          url: jdbc:mysql://maf-mysql-server-slave:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        replica_1:
+          url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
         quartz:
-          url: jdbc:mysql://maf-mysql-server-master:3306/QUARTZ_DB?useSSL=true&useUnicode=true
+          url: jdbc:mysql://maf-mysql-server-source:3306/QUARTZ_DB?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver

diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/src/main/resources/application-development-local.yml
@@ -6,12 +6,12 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
+        source_1:
           url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
+        replica_1:
           url: jdbc:mysql://localhost:3307/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql

diff --git a/auth-center/src/main/resources/application-production.yml b/auth-center/src/main/resources/application-production.yml
@@ -6,18 +6,18 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
-          url: jdbc:mysql://maf-mysql-server-master:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        source_1:
+          url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
-          url: jdbc:mysql://maf-mysql-server-slave:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        replica_1:
+          url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
         quartz:
-          url: jdbc:mysql://maf-mysql-server-master:3306/QUARTZ_DB?useSSL=true&useUnicode=true
+          url: jdbc:mysql://maf-mysql-server-source:3306/QUARTZ_DB?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver

diff --git a/auth-center/src/main/resources/application-stage.yml b/auth-center/src/main/resources/application-stage.yml
@@ -6,18 +6,18 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
-          url: jdbc:mysql://maf-mysql-server-master:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        source_1:
+          url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
-          url: jdbc:mysql://maf-mysql-server-slave:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        replica_1:
+          url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
         quartz:
-          url: jdbc:mysql://maf-mysql-server-master:3306/QUARTZ_DB?useSSL=true&useUnicode=true
+          url: jdbc:mysql://maf-mysql-server-source:3306/QUARTZ_DB?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver

diff --git a/auth-center/src/main/resources/application-test.yml b/auth-center/src/main/resources/application-test.yml
@@ -6,18 +6,18 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
-          url: jdbc:mysql://maf-mysql-server-master:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        source_1:
+          url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
-          url: jdbc:mysql://maf-mysql-server-slave:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        replica_1:
+          url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
         quartz:
-          url: jdbc:mysql://maf-mysql-server-master:3306/QUARTZ_DB?useSSL=true&useUnicode=true
+          url: jdbc:mysql://maf-mysql-server-source:3306/QUARTZ_DB?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver

diff --git a/auth-center/src/main/resources/application.yml b/auth-center/src/main/resources/application.yml
@@ -42,7 +42,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     dynamic:
-      primary: master_1
+      primary: source_1
       druid:
         # connection pool size will be determined by DruidDataSourceCreatorPostProcessor.java
         max-wait: 60000

diff --git a/docker/.env b/docker/.env
@@ -6,7 +6,7 @@ MAF_TAG=0.0.2
 ##################################################
 # Container version                              #
 ##################################################
-MYSQL_SERVER_TAG=8.0.23-1.1.19
+MYSQL_SERVER_TAG=8.0.26
 REDIS_TAG=6.2.5-alpine
 REDIS_CLUSTER_TAG=6.2.5
 ATMOZ_SFTP_TAG=alpine
@@ -34,8 +34,8 @@ SPRING_ENVIRONMENT=development-docker
 #  (also docker container hostnames)             #
 ##################################################
 ############# Infrastructure Services ############
-MYSQL_SERVER_MASTER_CONTAINER_NAME=maf-mysql-server-master
-MYSQL_SERVER_SLAVE_CONTAINER_NAME=maf-mysql-server-slave
+MYSQL_SERVER_SOURCE_CONTAINER_NAME=maf-mysql-server-source
+MYSQL_SERVER_REPLICA_1_CONTAINER_NAME=maf-mysql-server-replica-1
 REDIS_MASTER_CONTAINER_NAME=maf-redis-master
 REDIS_SLAVE_1_CONTAINER_NAME=maf-redis-slave-1
 REDIS_NODE_1_CONTAINER_NAME=maf-redis-node-1

diff --git a/docker/configuration/mysql-server/README.md b/docker/configuration/mysql-server/README.md
@@ -27,7 +27,7 @@ script
 
    ```mysql
    CHANGE MASTER TO 
-   MASTER_HOST='maf-mysql-server-master',
+   MASTER_HOST='maf-mysql-server-source',
    MASTER_PORT=3306,
    MASTER_USER='replication_user',
    MASTER_PASSWORD='replication_password',

diff --git a/...tion/mysql-server/slave-1/mysql-slave.cnf → ...guration/mysql-server/replica-1/mysql.cnf b/...tion/mysql-server/slave-1/mysql-slave.cnf → ...guration/mysql-server/replica-1/mysql.cnf
@@ -48,7 +48,7 @@ gtid_mode=ON
 enforce_gtid_consistency=true
 read-only=ON
 skip-log-bin
-skip-log-slave-updates
+skip-log-replica-updates
 replicate-ignore-db=information_schema
 replicate-ignore-db=mysql
 replicate-ignore-db=performance_schema

diff --git a/...tion/mysql-server/master/mysql-master.cnf → ...nfiguration/mysql-server/source/mysql.cnf b/...tion/mysql-server/master/mysql-master.cnf → ...nfiguration/mysql-server/source/mysql.cnf
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -4,8 +4,8 @@ services:
   ################################################################################
   #                           Infrastructure Services                            #
   ################################################################################
-  mysql-server-master:
-    container_name: ${MYSQL_SERVER_MASTER_CONTAINER_NAME}
+  mysql-server-source:
+    container_name: ${MYSQL_SERVER_SOURCE_CONTAINER_NAME}
     image: mysql/mysql-server:${MYSQL_SERVER_TAG}
     environment:
       MYSQL_ROOT_HOST: "%"
@@ -16,9 +16,9 @@ services:
       - "3306:3306"
     restart: always
     volumes:
-      - "~/docker-file-mapping/${MYSQL_SERVER_MASTER_CONTAINER_NAME}:/var/lib/mysql"
-      - ./configuration/mysql-server/master/mysql-master.cnf:/etc/my.cnf
-      - ./script/mysql-server-master:/docker-entrypoint-initdb.d
+      - ~/docker-file-mapping/${MYSQL_SERVER_SOURCE_CONTAINER_NAME}:/var/lib/mysql
+      - ./configuration/mysql-server/source/mysql.cnf:/etc/my.cnf
+      - ./script/mysql-server-source:/docker-entrypoint-initdb.d
     command: >
       bash -c "
       chmod 644 /etc/my.cnf
@@ -27,22 +27,23 @@ services:
     networks:
       muscle_and_fitness_network:
 
-  mysql-server-slave:
-    container_name: ${MYSQL_SERVER_SLAVE_CONTAINER_NAME}
+  mysql-server-replica-1:
+    container_name: ${MYSQL_SERVER_REPLICA_1_CONTAINER_NAME}
     image: mysql/mysql-server:${MYSQL_SERVER_TAG}
     depends_on:
-      - mysql-server-master
+      - mysql-server-source
     environment:
       MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: ${MAF_MYSQL_ROOT_PASSWORD}
       MYSQL_DATABASE: ${MAF_MYSQL_DATABASE}
+      TZ: ${MAF_TIMEZONE}
     ports:
       - "3307:3306"
     restart: always
     volumes:
-      - "~/docker-file-mapping/${MYSQL_SERVER_SLAVE_CONTAINER_NAME}:/var/lib/mysql"
-      - ./configuration/mysql-server/slave-1/mysql-slave.cnf:/etc/my.cnf
-      - ./script/mysql-server-slave:/docker-entrypoint-initdb.d
+      - ~/docker-file-mapping/${MYSQL_SERVER_REPLICA_1_CONTAINER_NAME}:/var/lib/mysql
+      - ./configuration/mysql-server/replica-1/mysql.cnf:/etc/my.cnf
+      - ./script/mysql-server-replica-1:/docker-entrypoint-initdb.d
     command: >
       bash -c "
       chmod 644 /etc/my.cnf
@@ -327,7 +328,7 @@ services:
     image: ijohnnymiller/muscle-and-fitness-server.auth-center:${MAF_TAG}
     depends_on:
       - consul-registry
-      - mysql-server-slave
+      - mysql-server-replica-1
       - redis-slave-1
       - rabbitmq
     restart: always
@@ -353,7 +354,7 @@ services:
       - consul-registry
       - rabbitmq
       - minio
-      - mysql-server-slave
+      - mysql-server-replica-1
       - redis-slave-1
     restart: always
     volumes:
@@ -376,7 +377,7 @@ services:
     image: ijohnnymiller/muscle-and-fitness-server.maf-mis:${MAF_TAG}
     depends_on:
       - consul-registry
-      - mysql-server-slave
+      - mysql-server-replica-1
       - redis-slave-1
       - rabbitmq
     restart: always

diff --git a/...script/mysql-server-slave/1_init_user.sql → ...pt/mysql-server-replica-1/1_init_user.sql b/...script/mysql-server-slave/1_init_user.sql → ...pt/mysql-server-replica-1/1_init_user.sql
diff --git a/...pt/mysql-server-master/2_Dump20210801.sql → ...mysql-server-replica-1/2_Dump20210919.sql b/...pt/mysql-server-master/2_Dump20210801.sql → ...mysql-server-replica-1/2_Dump20210919.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.23, for Win64 (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.25, for macos11 (x86_64)
 --
 -- Host: 127.0.0.1    Database: muscle_and_fitness
 -- ------------------------------------------------------
--- Server version	8.0.23
+-- Server version	8.0.26
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -509,4 +509,4 @@ SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-08-01  1:55:01
+-- Dump completed on 2021-09-19 15:30:35
diff --git a/...r-master/3_quartz_tables_mysql_innodb.sql → ...eplica-1/3_quartz_tables_mysql_innodb.sql b/...r-master/3_quartz_tables_mysql_innodb.sql → ...eplica-1/3_quartz_tables_mysql_innodb.sql
diff --git a/docker/script/mysql-server-replica-1/4_replication_configuration.sql b/docker/script/mysql-server-replica-1/4_replication_configuration.sql
@@ -0,0 +1,20 @@
+# CHANGE MASTER TO
+#     MASTER_HOST = 'maf-mysql-server-source',
+#     MASTER_PORT = 3306,
+#     MASTER_USER = 'replication_user',
+#     MASTER_PASSWORD = 'replication_password',
+#     GET_MASTER_PUBLIC_KEY = 1,
+#     MASTER_AUTO_POSITION = 1;
+#
+# START SLAVE;
+
+# https://dev.mysql.com/doc/refman/8.0/en/change-replication-source-to.html
+CHANGE REPLICATION SOURCE TO
+    SOURCE_HOST = 'maf-mysql-server-source',
+    SOURCE_PORT = 3306,
+    SOURCE_USER = 'replication_user',
+    SOURCE_PASSWORD = 'replication_password',
+    GET_SOURCE_PUBLIC_KEY = 1,
+    SOURCE_AUTO_POSITION = 1;
+
+START REPLICA;
diff --git a/docker/script/mysql-server-slave/4_replication_configuration.sql b/docker/script/mysql-server-slave/4_replication_configuration.sql
diff --git a/...cript/mysql-server-master/1_init_user.sql → ...cript/mysql-server-source/1_init_user.sql b/...cript/mysql-server-master/1_init_user.sql → ...cript/mysql-server-source/1_init_user.sql
diff --git a/...ipt/mysql-server-slave/2_Dump20210801.sql → ...pt/mysql-server-source/2_Dump20210919.sql b/...ipt/mysql-server-slave/2_Dump20210801.sql → ...pt/mysql-server-source/2_Dump20210919.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.23, for Win64 (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.25, for macos11 (x86_64)
 --
 -- Host: 127.0.0.1    Database: muscle_and_fitness
 -- ------------------------------------------------------
--- Server version	8.0.23
+-- Server version	8.0.26
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -509,4 +509,4 @@ SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-08-01  1:55:01
+-- Dump completed on 2021-09-19 15:30:35
diff --git a/...er-slave/3_quartz_tables_mysql_innodb.sql → ...r-source/3_quartz_tables_mysql_innodb.sql b/...er-slave/3_quartz_tables_mysql_innodb.sql → ...r-source/3_quartz_tables_mysql_innodb.sql
diff --git a/maf-mis/src/main/resources/application-development-docker.yml b/maf-mis/src/main/resources/application-development-docker.yml
@@ -6,18 +6,18 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
-          url: jdbc:mysql://maf-mysql-server-master:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        source_1:
+          url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
-          url: jdbc:mysql://maf-mysql-server-slave:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        replica_1:
+          url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
         quartz:
-          url: jdbc:mysql://maf-mysql-server-master:3306/QUARTZ_DB?useSSL=true&useUnicode=true
+          url: jdbc:mysql://maf-mysql-server-source:3306/QUARTZ_DB?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver

diff --git a/maf-mis/src/main/resources/application-development-local.yml b/maf-mis/src/main/resources/application-development-local.yml
@@ -6,12 +6,12 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
+        source_1:
           url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
+        replica_1:
           url: jdbc:mysql://localhost:3307/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql

diff --git a/maf-mis/src/main/resources/application-production.yml b/maf-mis/src/main/resources/application-production.yml
@@ -6,18 +6,18 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
-          url: jdbc:mysql://maf-mysql-server-master:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        source_1:
+          url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
-          url: jdbc:mysql://maf-mysql-server-slave:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        replica_1:
+          url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
         quartz:
-          url: jdbc:mysql://maf-mysql-server-master:3306/QUARTZ_DB?useSSL=true&useUnicode=true
+          url: jdbc:mysql://maf-mysql-server-source:3306/QUARTZ_DB?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver

diff --git a/maf-mis/src/main/resources/application-stage.yml b/maf-mis/src/main/resources/application-stage.yml
@@ -6,18 +6,18 @@ spring:
   datasource:
     dynamic:
       datasource:
-        master_1:
-          url: jdbc:mysql://maf-mysql-server-master:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        source_1:
+          url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
-        slave_1:
-          url: jdbc:mysql://maf-mysql-server-slave:3306/muscle_and_fitness?useSSL=true&useUnicode=true
+        replica_1:
+          url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true
           username: maf_mysql_r
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver
         quartz:
-          url: jdbc:mysql://maf-mysql-server-master:3306/QUARTZ_DB?useSSL=true&useUnicode=true
+          url: jdbc:mysql://maf-mysql-server-source:3306/QUARTZ_DB?useSSL=true&useUnicode=true
           username: maf_mysql_rw
           password: maf@mysql
           driver-class-name: com.mysql.cj.jdbc.Driver