From 5c736297870798ea4a9273f4f7d12fa8b194d59d Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Fri, 19 Apr 2024 08:44:02 +0200 Subject: [PATCH 1/5] baseUrl --- addons/recovery/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/recovery/manifest.yml b/addons/recovery/manifest.yml index e86aa1b2..05561385 100644 --- a/addons/recovery/manifest.yml +++ b/addons/recovery/manifest.yml @@ -7,7 +7,7 @@ description: short: The add-on performs a comprehensive diagnostic of your database cluster and can perform automatic recovery. logo: /images/database-recovery.png -baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery +baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-71286/addons/recovery targetNodes: nodeType: From 7b702e9dee7752d23bd390a25dc40712655faabe Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Fri, 19 Apr 2024 08:45:29 +0200 Subject: [PATCH 2/5] JE-71286 --- addons/recovery/scripts/db-recovery.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/recovery/scripts/db-recovery.js b/addons/recovery/scripts/db-recovery.js index 71d06cb9..28e8618b 100644 --- a/addons/recovery/scripts/db-recovery.js +++ b/addons/recovery/scripts/db-recovery.js @@ -518,9 +518,9 @@ function DBRecovery() { me.execRecovery = function(values) { values = values || {}; log("values->" + values); - log("curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values)); + log("curl --silent https://raw.githubusercontent.com/sych74/mysql-cluster/JE-71286/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values)); return nodeManager.cmd({ - command: "curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values), + command: "curl --silent https://raw.githubusercontent.com/sych74/mysql-cluster/JE-71286/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values), nodeid: values.nodeid || "" }); }; From 2512acb025ea8cbebde04edad7cbc2ed49180895 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Fri, 19 Apr 2024 10:27:47 +0200 Subject: [PATCH 3/5] JE-71286 --- addons/recovery/scripts/db-recovery.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/recovery/scripts/db-recovery.sh b/addons/recovery/scripts/db-recovery.sh index a0fc17eb..23b8e12c 100644 --- a/addons/recovery/scripts/db-recovery.sh +++ b/addons/recovery/scripts/db-recovery.sh @@ -525,6 +525,7 @@ galeraGetPrimaryNode(){ local primary_node='undefined' local primary_node_by_seq local serverName="$(getMysqlServerName)" + local wsrep_recover_log='/tmp/wsrep_recover.log' for node in "${nodes_to_fix[@]}" do [[ "${node}" == "${NODE_ADDRESS}" ]] && node="localhost" @@ -537,14 +538,15 @@ galeraGetPrimaryNode(){ else stopMysqlService "${node}" [[ ${primary_node} == 'undefined' ]] || continue - + if [[ "${serverName}" == "mariadb" ]]; then - command="${SSH} ${node} 'mysqld --wsrep-recover > /dev/null 2>&1 && tail -2 /var/log/mysql/mysqld.log |grep \"Recovered position\"'" + command="${SSH} ${node} 'mysqld --wsrep-recover --log-error=${wsrep_recover_log} > /dev/null 2>&1 && tail -2 ${wsrep_recover_log} |grep \"Recovered position\"'" else - command="${SSH} ${node} 'mysqld --wsrep-recover --user=root> /dev/null 2>&1 && tail -2 /var/log/mysqld.log |grep \"Recovered position\"'" + command="${SSH} ${node} 'mysqld --wsrep-recover --user=root --log-error=${wsrep_recover_log} > /dev/null 2>&1 && tail -2 ${wsrep_recover_log} |grep \"Recovered position\"'" fi cur_seq_num=$(execSshReturn "$command" "[Node: ${node}]: Get seqno"|awk -F 'Recovered position:' '{print $2}'|awk -F : '{print $2}' ) - log "[Node: ${node}]: seqno=${cur_seq_num}" + [[ -f ${wsrep_recover_log} ]] && rm -f ${wsrep_recover_log} + log "[Node: ${node}]: seqno=${cur_seq_num}" fi if [[ "${seq_num}" -lt "${cur_seq_num}" ]]; then From 0f81bd1a786023b0a470326bb8752b2226a555c4 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Thu, 25 Apr 2024 15:09:04 +0200 Subject: [PATCH 4/5] baseUrl --- addons/recovery/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/recovery/manifest.yml b/addons/recovery/manifest.yml index 05561385..e86aa1b2 100644 --- a/addons/recovery/manifest.yml +++ b/addons/recovery/manifest.yml @@ -7,7 +7,7 @@ description: short: The add-on performs a comprehensive diagnostic of your database cluster and can perform automatic recovery. logo: /images/database-recovery.png -baseUrl: https://raw.githubusercontent.com/sych74/mysql-cluster/JE-71286/addons/recovery +baseUrl: https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery targetNodes: nodeType: From 8f1dd2e7c9a0fd1ee7f37febf38bb12cfdd24f27 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Thu, 25 Apr 2024 15:10:26 +0200 Subject: [PATCH 5/5] baseUrl --- addons/recovery/scripts/db-recovery.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/recovery/scripts/db-recovery.js b/addons/recovery/scripts/db-recovery.js index 28e8618b..71d06cb9 100644 --- a/addons/recovery/scripts/db-recovery.js +++ b/addons/recovery/scripts/db-recovery.js @@ -518,9 +518,9 @@ function DBRecovery() { me.execRecovery = function(values) { values = values || {}; log("values->" + values); - log("curl --silent https://raw.githubusercontent.com/sych74/mysql-cluster/JE-71286/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values)); + log("curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values)); return nodeManager.cmd({ - command: "curl --silent https://raw.githubusercontent.com/sych74/mysql-cluster/JE-71286/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values), + command: "curl --silent https://raw.githubusercontent.com/jelastic-jps/mysql-cluster/master/addons/recovery/scripts/db-recovery.sh > /tmp/db-recovery.sh && bash /tmp/db-recovery.sh " + me.formatRecoveryAction(values), nodeid: values.nodeid || "" }); };