diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:26:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:26:54 +0300 |
| commit | c3752cef3c34589ea95a7ab66cff3dd5b11290d5 (patch) | |
| tree | c7b8eb21dedd3139dacf2c0a12bed6e362afa1d9 /scripts | |
| parent | 56ae0adee35c1bc053711a8579857e6b0301eb80 (diff) | |
| parent | 2a93e632b1676b6df3dde150888d6428a57f8399 (diff) | |
| download | mariadb-git-c3752cef3c34589ea95a7ab66cff3dd5b11290d5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 48db55b8f18..573e747c55f 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -1,6 +1,6 @@ #!/bin/bash -ue # Copyright (C) 2013 Percona Inc -# Copyright (C) 2017-2019 MariaDB +# Copyright (C) 2017-2020 MariaDB # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -362,7 +362,7 @@ read_cnf() iopts=$(parse_cnf sst inno-backup-opts "") iapts=$(parse_cnf sst inno-apply-opts "") impts=$(parse_cnf sst inno-move-opts "") - stimeout=$(parse_cnf sst sst-initial-timeout 100) + stimeout=$(parse_cnf sst sst-initial-timeout 300) ssyslog=$(parse_cnf sst sst-syslog 0) ssystag=$(parse_cnf mysqld_safe syslog-tag "${SST_SYSLOG_TAG:-}") ssystag+="-" @@ -623,7 +623,8 @@ recv_joiner() popd 1>/dev/null if [[ ${RC[0]} -eq 124 ]];then - wsrep_log_error "Possible timeout in receving first data from donor in gtid stage" + wsrep_log_error "Possible timeout in receiving first data from " + "donor in gtid stage: exit codes: ${RC[@]}" exit 32 fi |