From 269e47b9de3436ef055fbfcb06cf3e5f10c38ab1 Mon Sep 17 00:00:00 2001 From: sych74 Date: Mon, 30 Oct 2023 15:56:41 +0100 Subject: [PATCH 1/8] JE-68221 --- scripts/common.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/common.yml b/scripts/common.yml index 79fdd542..1ddc8e0f 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -64,7 +64,7 @@ actions: setupAdminUser: - cmd[${this.id}]: |- - wget ${baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log; + wget https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0/scripts/setupUser.sh -O ~/setupUser.sh; bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log; user: root @@ -77,7 +77,7 @@ actions: pswd: ${globals.REPLICA_PSWD} addCustomConfig: - - cmd[sqldb]: wget ${baseUrl}/configs/custom.cnf -O ${globals.customConfigFile} &>> /var/log/run.log; + - cmd[sqldb]: wget https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0/configs/custom.cnf -O ${globals.customConfigFile}; - env.file.AddFavorite: nodeGroup: sqldb path: ${globals.customConfigFile} From b6b76082db0d3c636bc1772203e6976593ef2b89 Mon Sep 17 00:00:00 2001 From: sych74 Date: Thu, 23 Nov 2023 11:03:02 +0100 Subject: [PATCH 2/8] JE-67893 --- scripts/common.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/common.yml b/scripts/common.yml index 398e3f31..86d9af39 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -1,4 +1,5 @@ globals: + baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 customConfigFile: /etc/mysql/conf.d/my_custom.cnf actions: @@ -74,7 +75,7 @@ actions: setupAdminUser: - cmd[${this.id}]: |- - wget https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0/scripts/setupUser.sh -O ~/setupUser.sh; + wget ${globals.baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh; bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log; user: root @@ -87,7 +88,7 @@ actions: pswd: ${globals.REPLICA_PSWD} addCustomConfig: - - cmd[sqldb]: wget https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0/configs/custom.cnf -O ${globals.customConfigFile}; + - cmd[sqldb]: wget ${globals.baseUrl}/configs/custom.cnf -O ${globals.customConfigFile}; - env.file.AddFavorite: nodeGroup: sqldb path: ${globals.customConfigFile} From 5c169d1fa551789de0595e8876693834339c43f1 Mon Sep 17 00:00:00 2001 From: sych74 Date: Thu, 23 Nov 2023 11:05:59 +0100 Subject: [PATCH 3/8] JE-67893 --- scripts/common.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/common.yml b/scripts/common.yml index 86d9af39..69498905 100644 --- a/scripts/common.yml +++ b/scripts/common.yml @@ -1,5 +1,5 @@ globals: - baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 + 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 +75,7 @@ actions: setupAdminUser: - cmd[${this.id}]: |- - wget ${globals.baseUrl}/scripts/setupUser.sh -O ~/setupUser.sh; + 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 ${globals.baseUrl}/configs/custom.cnf -O ${globals.customConfigFile}; + - cmd[sqldb]: wget ${globals.db_cluster_path}/configs/custom.cnf -O ${globals.customConfigFile}; - env.file.AddFavorite: nodeGroup: sqldb path: ${globals.customConfigFile} From 1044d71a14e0919da7de60ddd9955014db95763d Mon Sep 17 00:00:00 2001 From: sych74 Date: Tue, 23 Jan 2024 21:45:13 +0100 Subject: [PATCH 4/8] Update proxy-common.yml --- scripts/proxy-common.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/proxy-common.yml b/scripts/proxy-common.yml index abe1d32b..dda8f914 100644 --- a/scripts/proxy-common.yml +++ b/scripts/proxy-common.yml @@ -1,3 +1,6 @@ +globals: + db_cluster_path: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/v3.0.0 + actions: setupOrchestrator: - log: Orchestrator configuration @@ -11,7 +14,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 ${baseUrl}/configs/orchestrator.conf.json -O /etc/orchestrator.conf.json &>> /var/log/run.log + wget ${globals.db_cluster_path}/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 a3641c769160d2e8bff6af65e156c40dbd5dc63d Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 28 Feb 2024 09:14:44 +0100 Subject: [PATCH 5/8] baseUrl --- manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yml b/manifest.yml index d0888f5c..2b18f176 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-70722 settings: fields: From 94874ff8b9c723236409f189becf11402aa75e08 Mon Sep 17 00:00:00 2001 From: sych74 Date: Wed, 28 Feb 2024 09:15:27 +0100 Subject: [PATCH 6/8] 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..a2704557 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-70722 logo: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/images/mysql-logo.png From 8374cd18ee3a4ace8d02c324839510dbaa41c667 Mon Sep 17 00:00:00 2001 From: sych74 Date: Tue, 5 Mar 2024 07:12:37 +0100 Subject: [PATCH 7/8] JE-70722 --- scripts/galera.jps | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/galera.jps b/scripts/galera.jps index 429d85eb..8edd77b1 100644 --- a/scripts/galera.jps +++ b/scripts/galera.jps @@ -153,6 +153,7 @@ actions: [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache pgrep mysql 1>/dev/null && pkill -9 mysql; pgrep mariadb 1>/dev/null && pkill -9 mariadb || true + systemctl reset-failed user: root restartNodesInOrder: From 6ab2a81b3b9324838d444d53e4e5babd41e706aa Mon Sep 17 00:00:00 2001 From: sych74 Date: Tue, 5 Mar 2024 07:13:23 +0100 Subject: [PATCH 8/8] JE-70722 --- scripts/xtradb.jps | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/xtradb.jps b/scripts/xtradb.jps index 1bb1b995..19e6c37c 100644 --- a/scripts/xtradb.jps +++ b/scripts/xtradb.jps @@ -134,6 +134,7 @@ actions: [ -f /var/lib/mysql/galera.cache ] && rm -f /var/lib/mysql/galera.cache pgrep mysql 1>/dev/null && pkill -9 mysql; pgrep mariadb 1>/dev/null && pkill -9 mariadb || true + systemctl reset-failed user: root restartNodesInOrder: