From d276fe17f88843a606b30383e35489fde6510b9b Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:51:47 +0100 Subject: [PATCH 01/20] Update common.yml --- scripts/common.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/common.yml b/scripts/common.yml index 69498905..c2020d00 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -1,5 +1,4 @@ globals: - db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 customConfigFile: /etc/mysql/conf.d/my_custom.cnf actions: @@ -75,7 +74,7 @@ actions: setupAdminUser: - cmd[${this.id}]: |- - wget ${globals.db_cluster_path}/scripts/setupUser.sh -O ~/setupUser.sh; + wget ${baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log; bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log; user: root @@ -88,7 +87,7 @@ actions: pswd: ${globals.REPLICA_PSWD} addCustomConfig: - - cmd[sqldb]: wget ${globals.db_cluster_path}/configs/custom.cnf -O ${globals.customConfigFile}; + - cmd[sqldb]: wget ${baseUrl}/configs/custom.cnf -O ${globals.customConfigFile} &>> /var/log/run.log; - env.file.AddFavorite: nodeGroup: sqldb path: ${globals.customConfigFile} From e468c7797658ec543cb569489c172139754727ea Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:52:54 +0100 Subject: [PATCH 02/20] Update proxy-common.yml --- scripts/proxy-common.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/proxy-common.yml b/scripts/proxy-common.yml index dda8f914..abe1d32b 100644 --- a/scripts/proxy-common.yml +++ b/scripts/proxy-common.yml @@ -1,6 +1,3 @@ -globals: - db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 - actions: setupOrchestrator: - log: Orchestrator configuration @@ -14,7 +11,7 @@ actions: mysql -h 127.0.0.1 -P3360 -uroot -e "SET PASSWORD FOR 'admin'@'127.0.0.1' = PASSWORD('${globals.ORCH_PASS}');" fi mysql -h 127.0.0.1 -P3360 -uroot -e "FLUSH PRIVILEGES;" - wget ${globals.db_cluster_path}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log + wget ${baseUrl}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log sed -i -e 's|orc_client_user|${globals.DB_USER}|g' /etc/orchestrator.conf.json sed -i -e 's|orc_client_password|${globals.DB_PASS}|g' /etc/orchestrator.conf.json sed -i -e 's|orc_server_user|admin|g' /etc/orchestrator.conf.json From 957eb1a8b5df1348b810ff687c536aa1becca702 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:54:34 +0100 Subject: [PATCH 03/20] JE-59466 --- scripts/common.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/common.yml b/scripts/common.yml index c2020d00..9593bd3c 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -113,3 +113,11 @@ actions: }); if (resp.result != 0) return resp; return {result: 0}; + + applyVersionConfiguration: + - if (/mysql/.test("${nodes.sqldb.nodeType}") && '${fn.compare([nodes.sqldb.version], 8.0.25)}' == 1): + cmd[${this.id}]: |- + sed -i "s/log-slave-updates/log_replica_updates/" ${this.conf_file}; + sed -i "s/slave-skip-errors/replica_skip_errors/" ${this.conf_file}; + sed -i "s/expire_logs_days.*/binlog_expire_logs_seconds = 604800/" ${this.conf_file}; + From 4f4f08045313590a744c920d378f474d8d937b22 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:55:48 +0100 Subject: [PATCH 04/20] JE-59466 --- scripts/master-master.jps | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/scripts/master-master.jps b/scripts/master-master.jps index 6ba2f33f..d397d642 100644 --- a/scripts/master-master.jps +++ b/scripts/master-master.jps @@ -3,7 +3,7 @@ id: mysql-master-master-replication-cluster name: MySQL/MariaDB/Percona Primary-Primary Replication Database Cluster description: 'DB Auto Clustering: 1 x Primary + N x Secondary' -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new success: text: /texts/phpmyadmin-credentials.md @@ -19,20 +19,6 @@ globals: DB_USER: ${settings.db_user:user-[fn.random]} DB_PASS: ${settings.db_pass:[fn.password(20)]} -onBeforeMigrate: - - isEnvRunning - - if (!${response.isEnvRunning}): - - stopEvent: - type: warning - message: "Please run the environment before migration, otherwise the database cluster will be broken." - -onBeforeClone: - - isEnvRunning - - if (!${response.isEnvRunning}): - - stopEvent: - type: warning - message: "Please run the environment before cloning, otherwise the database cluster will be broken." - onAfterScaleOut[sqldb]: - forEach(event.response.nodes): - syncCustomConfig: @@ -92,6 +78,11 @@ actions: sed -i "s/report_host.*/report_host = node${this.id}/" /etc/mysql/conf.d/master.cnf; sed -i "s/server-id.*/server-id = ${this.id}/" /etc/mysql/conf.d/master.cnf; sed -i "s/auto-increment-offset.*/auto-increment-offset = ${this.increment}/" /etc/mysql/conf.d/master.cnf; + + - applyVersionConfiguration: + id: ${this} + conf_file: /etc/mysql/conf.d/master.cnf + - if (/mysql/.test("${nodes.sqldb.nodeType}")): - cmd[${this.id}]: |- echo "master_info_repository=TABLE" >> /etc/mysql/conf.d/master.cnf; @@ -112,6 +103,11 @@ actions: sed -i "s/server-id.*/server-id = ${this}/" /etc/mysql/conf.d/slave.cnf; sed -i "s/report_host.*/report_host = node${this}/" /etc/mysql/conf.d/slave.cnf; sed -i '/log-slave-updates/d' /etc/mysql/conf.d/slave.cnf; + + - applyVersionConfiguration: + id: ${this} + conf_file: /etc/mysql/conf.d/slave.cnf + - if (/mysql/.test("${nodes.sqldb.nodeType}")): - cmd[${this}]: |- echo "master_info_repository=TABLE" >> /etc/mysql/conf.d/slave.cnf; From d1514b04ace41230fbffd1c13eb6e9b0f327c284 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:56:26 +0100 Subject: [PATCH 05/20] JE-59466 --- scripts/master-slave.jps | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps index 2a69a53a..347f1f27 100644 --- a/scripts/master-slave.jps +++ b/scripts/master-slave.jps @@ -3,7 +3,7 @@ id: mysql-master-slave-replication-cluster name: MySQL/MariaDB/Percona Primary-Secondary Replication Database Cluster description: 'DB Auto Clustering: 1 x Primary + N x Secondary' -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466 success: text: /texts/phpmyadmin-credentials.md @@ -19,20 +19,6 @@ globals: DB_USER: ${settings.db_user:user-[fn.random]} DB_PASS: ${settings.db_pass:[fn.password(20)]} -onBeforeMigrate: - - isEnvRunning - - if (!${response.isEnvRunning}): - - stopEvent: - type: warning - message: "Please run the environment before migration, otherwise the database cluster will be broken." - -onBeforeClone: - - isEnvRunning - - if (!${response.isEnvRunning}): - - stopEvent: - type: warning - message: "Please run the environment before cloning, otherwise the database cluster will be broken." - onAfterScaleOut[sqldb]: - forEach(event.response.nodes): - syncCustomConfig: @@ -77,6 +63,11 @@ actions: sed -i "s/server-id.*/server-id = ${this}/" /etc/mysql/conf.d/master.cnf sed -i "s/report_host.*/report_host = node${this}/" /etc/mysql/conf.d/master.cnf sed -i "/auto-increment/d" /etc/mysql/conf.d/master.cnf + + - applyVersionConfiguration: + id: ${this} + conf_file: /etc/mysql/conf.d/master.cnf + - if (!${settings.clone:false}): - setupUsers: id: ${this} @@ -87,6 +78,11 @@ actions: wget ${baseUrl}/configs/slave.cnf -O /etc/mysql/conf.d/slave.cnf &>> /var/log/run.log sed -i "s/server-id.*/server-id = ${this}/" /etc/mysql/conf.d/slave.cnf sed -i "s/report_host.*/report_host = node${this}/" /etc/mysql/conf.d/slave.cnf + + - applyVersionConfiguration: + id: ${this} + conf_file: /etc/mysql/conf.d/slave.cnf + - setNodeDisplayName[${this}]: Secondary addSlave: From bc9ddd63a1c7780bb8f94f40e145bed5d380b6a1 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:56:35 +0100 Subject: [PATCH 06/20] Update master-slave.jps --- scripts/master-slave.jps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps index 347f1f27..901a86a0 100644 --- a/scripts/master-slave.jps +++ b/scripts/master-slave.jps @@ -3,7 +3,7 @@ id: mysql-master-slave-replication-cluster name: MySQL/MariaDB/Percona Primary-Secondary Replication Database Cluster description: 'DB Auto Clustering: 1 x Primary + N x Secondary' -baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466 +baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new success: text: /texts/phpmyadmin-credentials.md From d34a7c4dc85e9b025851f213c19a5184c3ad35a6 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:57:04 +0100 Subject: [PATCH 07/20] Update auto-cluster.jps --- addons/auto-clustering/auto-cluster.jps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auto-clustering/auto-cluster.jps b/addons/auto-clustering/auto-cluster.jps index d3209ef1..be3bba67 100644 --- a/addons/auto-clustering/auto-cluster.jps +++ b/addons/auto-clustering/auto-cluster.jps @@ -9,7 +9,7 @@ description: healthcheck and autodiscovery of newly added DB nodes short: Scalable MySQL cluster with ProxySQL for even load distribution -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png From 0b8e15a4caea2b3757dd58d51b500b4e5a073316 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 09:57:33 +0100 Subject: [PATCH 08/20] JE-59466 --- manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yml b/manifest.yml index d0888f5c..c9364e92 100644 --- a/manifest.yml +++ b/manifest.yml @@ -16,7 +16,7 @@ logo: /images/mysql-mariadb-percona-logo.png?_r=1 onBeforeInit: /scripts/settings.js?_r=${fn.random} -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-59466-new settings: fields: From 3b88ac1f49aa387b3ed1bcfc29dadf20cd6f0be7 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 10:05:26 +0100 Subject: [PATCH 09/20] JE-59466 --- scripts/master-master.jps | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/master-master.jps b/scripts/master-master.jps index d397d642..003fbb3e 100644 --- a/scripts/master-master.jps +++ b/scripts/master-master.jps @@ -19,6 +19,20 @@ globals: DB_USER: ${settings.db_user:user-[fn.random]} DB_PASS: ${settings.db_pass:[fn.password(20)]} +onBeforeMigrate: + - isEnvRunning + - if (!${response.isEnvRunning}): + - stopEvent: + type: warning + message: "Please run the environment before migration, otherwise the database cluster will be broken." + +onBeforeClone: + - isEnvRunning + - if (!${response.isEnvRunning}): + - stopEvent: + type: warning + message: "Please run the environment before cloning, otherwise the database cluster will be broken." + onAfterScaleOut[sqldb]: - forEach(event.response.nodes): - syncCustomConfig: From 80d6cdde197622e343133867c38b87c79bce3207 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 7 Feb 2024 10:06:13 +0100 Subject: [PATCH 10/20] JE-59466 --- scripts/master-slave.jps | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps index 901a86a0..8e6d55ec 100644 --- a/scripts/master-slave.jps +++ b/scripts/master-slave.jps @@ -19,6 +19,20 @@ globals: DB_USER: ${settings.db_user:user-[fn.random]} DB_PASS: ${settings.db_pass:[fn.password(20)]} +onBeforeMigrate: + - isEnvRunning + - if (!${response.isEnvRunning}): + - stopEvent: + type: warning + message: "Please run the environment before migration, otherwise the database cluster will be broken." + +onBeforeClone: + - isEnvRunning + - if (!${response.isEnvRunning}): + - stopEvent: + type: warning + message: "Please run the environment before cloning, otherwise the database cluster will be broken." + onAfterScaleOut[sqldb]: - forEach(event.response.nodes): - syncCustomConfig: From d5f3ecbe3672f63a85a932c23bc909c4fde28159 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 14 Feb 2024 15:52:17 +0100 Subject: [PATCH 11/20] JE-59466 --- scripts/master-master.jps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/master-master.jps b/scripts/master-master.jps index 003fbb3e..1836dac3 100644 --- a/scripts/master-master.jps +++ b/scripts/master-master.jps @@ -94,7 +94,7 @@ actions: sed -i "s/auto-increment-offset.*/auto-increment-offset = ${this.increment}/" /etc/mysql/conf.d/master.cnf; - applyVersionConfiguration: - id: ${this} + id: ${this.id} conf_file: /etc/mysql/conf.d/master.cnf - if (/mysql/.test("${nodes.sqldb.nodeType}")): From 7f320afe65fd34485bfa0e515807a627fc7f0106 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 14 Feb 2024 16:17:01 +0100 Subject: [PATCH 12/20] JE-59466 --- scripts/master-master.jps | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/master-master.jps b/scripts/master-master.jps index 1836dac3..110bffed 100644 --- a/scripts/master-master.jps +++ b/scripts/master-master.jps @@ -93,14 +93,15 @@ actions: sed -i "s/server-id.*/server-id = ${this.id}/" /etc/mysql/conf.d/master.cnf; sed -i "s/auto-increment-offset.*/auto-increment-offset = ${this.increment}/" /etc/mysql/conf.d/master.cnf; - - applyVersionConfiguration: - id: ${this.id} - conf_file: /etc/mysql/conf.d/master.cnf - - if (/mysql/.test("${nodes.sqldb.nodeType}")): - cmd[${this.id}]: |- echo "master_info_repository=TABLE" >> /etc/mysql/conf.d/master.cnf; echo "relay_log_info_repository=TABLE" >> /etc/mysql/conf.d/master.cnf; + + - applyVersionConfiguration: + id: ${this.id} + conf_file: /etc/mysql/conf.d/master.cnf + - setupUsers: id: ${this.id} - setNodeDisplayName[${this.id}]: Primary From 1391f92373faf50237fa3fd0526e9bdcdf088ce7 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 14 Feb 2024 16:19:32 +0100 Subject: [PATCH 13/20] JE-59466 --- scripts/common.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/common.yml b/scripts/common.yml index 9593bd3c..ce22ac0d 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -120,4 +120,5 @@ actions: sed -i "s/log-slave-updates/log_replica_updates/" ${this.conf_file}; sed -i "s/slave-skip-errors/replica_skip_errors/" ${this.conf_file}; sed -i "s/expire_logs_days.*/binlog_expire_logs_seconds = 604800/" ${this.conf_file}; - + sed -i "/master_info_repository/d" ${this.conf_file}; + sed -i "/relay_log_info_repository/d" ${this.conf_file}; From 83054d5a48f0e3c52eec32c33093cdd75c307838 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 14 Feb 2024 16:22:10 +0100 Subject: [PATCH 14/20] JE-59466 --- scripts/master-master.jps | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/master-master.jps b/scripts/master-master.jps index 110bffed..b6d98bf4 100644 --- a/scripts/master-master.jps +++ b/scripts/master-master.jps @@ -119,14 +119,15 @@ actions: sed -i "s/report_host.*/report_host = node${this}/" /etc/mysql/conf.d/slave.cnf; sed -i '/log-slave-updates/d' /etc/mysql/conf.d/slave.cnf; - - applyVersionConfiguration: - id: ${this} - conf_file: /etc/mysql/conf.d/slave.cnf - - if (/mysql/.test("${nodes.sqldb.nodeType}")): - cmd[${this}]: |- echo "master_info_repository=TABLE" >> /etc/mysql/conf.d/slave.cnf; echo "relay_log_info_repository=TABLE" >> /etc/mysql/conf.d/slave.cnf; + + - applyVersionConfiguration: + id: ${this} + conf_file: /etc/mysql/conf.d/slave.cnf + - setupUsers: id: ${this} - setNodeDisplayName[${this}]: Secondary From ed51e6a894ac431acd42525b2ee623b1495aff05 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Mon, 15 Apr 2024 15:13:56 +0200 Subject: [PATCH 15/20] baseUrl --- manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yml b/manifest.yml index 8a86271a..2c7d3e52 100644 --- a/manifest.yml +++ b/manifest.yml @@ -17,7 +17,7 @@ logo: /images/mysql-mariadb-percona-logo.png?_r=1 onBeforeInit: /scripts/settings.js?_r=${fn.random} -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster settings: fields: From c97150fb92afa4c99e36b6bd23a2e29e53a3fb21 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Mon, 15 Apr 2024 15:14:21 +0200 Subject: [PATCH 16/20] baseUrl --- addons/auto-clustering/auto-cluster.jps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auto-clustering/auto-cluster.jps b/addons/auto-clustering/auto-cluster.jps index d3209ef1..bc842dd4 100644 --- a/addons/auto-clustering/auto-cluster.jps +++ b/addons/auto-clustering/auto-cluster.jps @@ -9,7 +9,7 @@ description: healthcheck and autodiscovery of newly added DB nodes short: Scalable MySQL cluster with ProxySQL for even load distribution -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png From 88d0100a574a100c175c12f3895fa95d82822899 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Mon, 15 Apr 2024 15:16:36 +0200 Subject: [PATCH 17/20] baseUrl --- scripts/common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common.yml b/scripts/common.yml index 69498905..6795c3fc 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -1,5 +1,5 @@ globals: - db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 + db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster customConfigFile: /etc/mysql/conf.d/my_custom.cnf actions: From bfb17fe310fd2fd696ee296eb3ffda14c9f4ae31 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Mon, 15 Apr 2024 15:33:39 +0200 Subject: [PATCH 18/20] baseUrl --- scripts/master-slave.jps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/master-slave.jps b/scripts/master-slave.jps index 2a69a53a..1d70a7b8 100644 --- a/scripts/master-slave.jps +++ b/scripts/master-slave.jps @@ -3,7 +3,7 @@ id: mysql-master-slave-replication-cluster name: MySQL/MariaDB/Percona Primary-Secondary Replication Database Cluster description: 'DB Auto Clustering: 1 x Primary + N x Secondary' -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster success: text: /texts/phpmyadmin-credentials.md From 1fa4bf887d3bf4d4059afaeaa16e6d0b76ce1994 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Mon, 15 Apr 2024 15:34:05 +0200 Subject: [PATCH 19/20] baseUrl --- scripts/master-master.jps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/master-master.jps b/scripts/master-master.jps index 6ba2f33f..77014db8 100644 --- a/scripts/master-master.jps +++ b/scripts/master-master.jps @@ -3,7 +3,7 @@ id: mysql-master-master-replication-cluster name: MySQL/MariaDB/Percona Primary-Primary Replication Database Cluster description: 'DB Auto Clustering: 1 x Primary + N x Secondary' -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 +baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/stage-cluster success: text: /texts/phpmyadmin-credentials.md From b940746c3bd8fe864671bb33e2747042b453246f Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Mon, 15 Apr 2024 15:52:31 +0200 Subject: [PATCH 20/20] baseUrl --- scripts/common.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/scripts/common.yml b/scripts/common.yml index c3509004..6795c3fc 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -75,7 +75,7 @@ actions: setupAdminUser: - cmd[${this.id}]: |- - wget ${baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log; + wget ${globals.db_cluster_path}/scripts/setupUser.sh -O ~/setupUser.sh; bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log; user: root @@ -88,7 +88,7 @@ actions: pswd: ${globals.REPLICA_PSWD} addCustomConfig: - - cmd[sqldb]: wget ${baseUrl}/configs/custom.cnf -O ${globals.customConfigFile} &>> /var/log/run.log; + - cmd[sqldb]: wget ${globals.db_cluster_path}/configs/custom.cnf -O ${globals.customConfigFile}; - env.file.AddFavorite: nodeGroup: sqldb path: ${globals.customConfigFile} @@ -114,12 +114,3 @@ actions: }); if (resp.result != 0) return resp; return {result: 0}; - - applyVersionConfiguration: - - if (/mysql/.test("${nodes.sqldb.nodeType}") && '${fn.compare([nodes.sqldb.version], 8.0.25)}' == 1): - cmd[${this.id}]: |- - sed -i "s/log-slave-updates/log_replica_updates/" ${this.conf_file}; - sed -i "s/slave-skip-errors/replica_skip_errors/" ${this.conf_file}; - sed -i "s/expire_logs_days.*/binlog_expire_logs_seconds = 604800/" ${this.conf_file}; - sed -i "/master_info_repository/d" ${this.conf_file}; - sed -i "/relay_log_info_repository/d" ${this.conf_file};