fixed case where combination of compress=no and specifying individual

vservers and mysqld wasn't running or mysqldump didn't exist would cause
a zero byte backup file

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@459 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/ChangeLog b/ChangeLog
index 85aae26bc1202cc78312115bde93f02b9a1190e2..b81469842abb86116f42595d59682f4cc28f9c63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@ version 0.9.5 -- unreleased
         . Support configuring PGSQLUSER for real, and document it a bit; this
           broken support actually prevented pgsql handler to work for VServers
           (Closes: #396578)
+       mysql:
+        . Fixed case where odd combination of configuration options caused sqldump
+          backups to get overwritten with an empty file (Closes: #402679)
     fixed automake 'make install' bug that failed if /etc/backup.d already
     existed
     changed spaces to tabs in Makefile.am

diff --git a/handlers/mysql b/handlers/mysql
index cd72fc9087bb7033e009f0c8125c0e75ef80b9a4..b3d0a73b08b709325372211dd8731ee0e2f2ff0c 100644 (file)
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -234,13 +234,13 @@ then
            databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
            if [ $? -ne 0 ]
            then
-               fatal "Authentication problem, maybe user/password is wrong"
+               fatal "Authentication problem, maybe user/password is wrong or mysqld is not running?"
            fi
        else
                databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
                if [ $? -ne 0 ]
                then
-                   fatal "Authentication problem, maybe user/password is wrong"
+                   fatal "Authentication problem, maybe user/password is wrong or mysqld is not running?"
                fi
        fi
 fi
@@ -249,16 +249,26 @@ fi
        do
                if [ $usevserver = yes ]
                then
+                   # Test to make sure mysqld is running, if it is not sqldump will not work
+                   $VSERVER $vsname exec su $user -c "$MYSQLADMIN $defaultsfile ping"
+                   if [ $? -ne 0 ]; then
+                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                   fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $vroot$dumpdir/${db}.sql.gz"
                    else
-                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $vroot$dumpdir/${db}.sql"
+                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db -r $vroot$dumpdir/${db}.sql"
                    fi
                else
+                   # Test to make sure mysqld is running, if it is not sqldump will not work
+                   su $user -c "$MYSQLADMIN $defaultsfile ping"
+                   if [ $? -ne 0 ]; then
+                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                   fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $dumpdir/${db}.sql.gz"
                    else
-                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
+                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db -r $dumpdir/${db}.sql"
                    fi
                fi
                debug "su $user -c \"$execstr\""

diff --git a/src/backupninja.in b/src/backupninja.in
index 8d1257f75e69ece85166da88fbb027f93ae1bb14..7430176f306a5a5cbde29eaab2099ac38a5a2889 100755 (executable)
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -445,6 +445,7 @@ getconf usecolors "yes"
 getconf SLAPCAT /usr/sbin/slapcat
 getconf LDAPSEARCH /usr/bin/ldapsearch
 getconf RDIFFBACKUP /usr/bin/rdiff-backup
+getconf MYSQLADMIN /usr/bin/mysqladmin
 getconf MYSQL /usr/bin/mysql
 getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
 getconf MYSQLDUMP /usr/bin/mysqldump