Skip to content

Je 71286 #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 25, 2024
Merged

Je 71286 #353

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c73629
baseUrl
sych74 Apr 19, 2024
7b702e9
JE-71286
sych74 Apr 19, 2024
2512acb
JE-71286
sych74 Apr 19, 2024
0f81bd1
baseUrl
sych74 Apr 25, 2024
8f1dd2e
baseUrl
sych74 Apr 25, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions addons/recovery/scripts/db-recovery.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down