diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-22 14:45:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-22 14:45:55 +0300 |
| commit | 455cf6196c8c73f5a50004ac7f31a9be8ac14bbe (patch) | |
| tree | 2d9d696bba2590c63278fee0047a046f58b51a31 /scripts | |
| parent | 42af2b1d8b8a8508c5aac5c2e0bcf4554c5200ce (diff) | |
| parent | e52a36d37be2fa8a2da8a987cb38cb0bb65233f4 (diff) | |
| download | mariadb-git-455cf6196c8c73f5a50004ac7f31a9be8ac14bbe.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 8969b01023b..f40a68a3b1e 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -235,7 +235,9 @@ wsrep_recover_position() { fi if [ -f $wr_logfile ]; then - [ "$euid" = "0" ] && chown $user $wr_logfile + # NOTE! Do not change ownership of the temporary file, as on newer kernel + # versions fs.protected_regular is set to '2' and redirecting output with > + # as root to a file not owned by root will fail with "Permission denied" chmod 600 $wr_logfile else log_error "WSREP: mktemp failed" @@ -250,6 +252,11 @@ wsrep_recover_position() { eval "$mysqld_cmd --wsrep_recover $wr_options 2> $wr_logfile" + if [ ! -s "$wr_logfile" ]; then + log_error "Log file $wr_logfile was empty, cannot proceed. Is system running fs.protected_regular?" + exit 1 + fi + local rp="$(grep 'WSREP: Recovered position:' $wr_logfile)" if [ -z "$rp" ]; then local skipped="$(grep WSREP $wr_logfile | grep 'skipping position recovery')" |