X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=1bf4edb48ca75e103d6862145914f6f56b71f468;hb=e9e56a7af88cb07d453a94af1133bf0665f00ae3;hp=d3179309412bde11ca83bd85dd12165ac0c1bbed;hpb=ee384b08c7dc9a1605e9525acd343099c763860e;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index d317930..1bf4edb 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -19,33 +19,28 @@ getconf dbpassword
 getconf configfile /etc/mysql/debian.cnf
 
 
-# If vservers are configured, decide if the handler should
-# use them or if it should just operate on the host
-
-if [ "$vservers" = "yes" ]
-then
-	if [ ! -z $vsname ]
-	then		
-		info "Using vserver '$vsname'"
-		usevserver=1
-	else
-		info "No vserver name specified, actions will be performed on the host"
-	fi
-fi
-
-# If needed, make sure that the specified vserver exists and is running.
-if [ $usevserver ]
-then
-	debug "Examining vserver '$vsname'"
-	# does it exist ?
-	vroot="$VROOTDIR/$vsname"
-	[ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
-	# is it running ?
-	$VSERVERINFO -q $vsname RUNNING
-	if [ $? -ne 0 ]
-	then
-		fatal "vserver $vsname is not running."
-	fi
+# Decide if the handler should operate on a vserver or on the host.
+# In the former case, check that $vsname exists and is running.
+local usevserver=no
+local vroot
+if [ $vservers_are_available = yes ]; then
+   if [ -n "$vsname" ]; then
+      # does it exist ?
+      if ! vservers_exist "$vsname" ; then
+         fatal "The vserver given in vsname ($vsname) does not exist."
+      fi
+      # is it running ?
+      $VSERVERINFO -q $vsname RUNNING
+      if [ $? -ne 0 ]; then
+         fatal "The vserver $vsname is not running."
+      fi
+      # everything ok
+      info "Using vserver '$vsname'."
+      usevserver=yes
+      vroot="$VROOTDIR/$vsname"
+   else
+      info "No vserver name specified, actions will be performed on the host."
+   fi
 fi
 
 ## Prepare ignore part of the command
@@ -63,7 +58,7 @@ done
 hotdir="$backupdir/hotcopy"
 dumpdir="$backupdir/sqldump"
 
-if [ $usevserver ]
+if [ $usevserver = yes ]
 then
 	[ "$sqldump" == "no" -o -d $vroot$dumpdir ] || $VSERVER $vsname exec mkdir -p $dumpdir
 	[ "$hotcopy" == "no" -o -d $vroot$hotdir ] || $VSERVER $vsname exec mkdir -p $hotdir
@@ -93,7 +88,7 @@ defaultsfile=""
 
 if [ "$dbusername" != "" -a "$dbpassword" != "" ]
 then
-    if [ $usevserver ]
+    if [ $usevserver = yes ]
     then
     	vhome=`$VSERVER $vsname exec getent passwd "root" | awk -F: '{print $6}'`
 	home="$vroot$vhome"
@@ -133,7 +128,7 @@ user=$dbusername
 password="$dbpassword"
 EOF
 	umask $oldmask
-	if [ $usevserver ] 
+	if [ $usevserver = yes ] 
 	then
 	    defaultsfile="--defaults-file=$vhome/.my.cnf"
 	else
@@ -141,13 +136,13 @@ EOF
 	fi
 fi
 
-# if a user is not set, use $confgfile, otherwise use $mycnf
+# if a user is not set, use $configfile, otherwise use $mycnf
 if [ "$user" == "" ]; then
 	user=root;
 	defaultsfile="--defaults-file=$configfile"
 else
 	userset=true;
-	if [ $usevserver ]
+	if [ $usevserver = yes ]
 	then
 	    vuserhome=`$VSERVER $vsname exec getent passwd "$user" | awk -F: '{print $6}'`
 	    if [ $? -eq 2 ]
@@ -165,7 +160,7 @@ else
 	
 	debug "User home set to: $userhome"
 	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-	defaultsfile="--defaults-file=$vuserhome/.my.cnf"
+	defaultsfile="--defaults-file=$userhome/.my.cnf"
 	debug "using $defaultsfile"
 fi
 
@@ -177,17 +172,17 @@ then
     info "Initializing hotcopy method"
     if [ "$databases" == "all" ]
     then
-	if [ $usevserver ]
+	if [ $usevserver = yes ]
 	then
 	    	info "dbhost: $dbhost"
 		execstr="$VSERVER $vsname exec $MYSQLHOTCOPY -h $dbhost --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
 	else
 		execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
 	fi
-	debug "su $user -c '$execstr'"
+	debug 'su $user -c \"$execstr\"'
 	if [ ! $test ]
 	then
-		output=`su $user -c "$execstr" 2>&1`
+		output=`su $user -c \"$execstr\" 2>&1`
 		code=$?
 		if [ "$code" == "0" ]
 		then
@@ -201,16 +196,16 @@ then
     else	
 	for db in $databases
 	do
-		if [ $usevserver ]
+		if [ $usevserver = yes ]
 		then
 			execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --allowold $db $hotdir"
 		else
 			execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
 		fi
-		debug "su $user -c '$execstr'"
+		debug 'su $user -c \"$execstr\"'
 		if [ ! $test ]
 		then
-			output=`su $user -c "$execstr" 2>&1`
+			output=`su $user -c \"$execstr\" 2>&1`
 			code=$?
 			if [ "$code" == "0" ]
 			then
@@ -233,16 +228,16 @@ then
     info "Initializing SQL dump method"
     if [ "$databases" == "all" ]
     then
-	if [ $usevserver ]
+	if [ $usevserver = yes ]
 	then
-	    debug "echo show databases | $VSERVER $vsname exec su $user -c $MYSQL $defaultsfile | grep -v Database"
-	    databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
+	    debug 'echo show databases | $VSERVER $vsname exec su $user -c \"$MYSQL $defaultsfile\" | grep -v Database'
+	    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"
 	    fi
 	else
-		databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
+		databases=`echo 'show databases' | su $user -c \"$MYSQL $defaultsfile\" | grep -v Database`
 		if [ $? -ne 0 ]
 		then
 		    fatal "Authentication problem, maybe user/password is wrong"
@@ -252,16 +247,16 @@ fi
 
 	for db in $databases
 	do
-		if [ $usevserver ]
+		if [ $usevserver = yes ]
 		then
 			execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $vroot$dumpdir/${db}.sql"
 		else
 			execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
 		fi
-		debug "su $user -c '$execstr'"
+		debug 'su $user -c \"$execstr\"'
 		if [ ! $test ]
 		then
-			output=`su $user -c "$execstr" 2>&1`
+			output=`su $user -c \"$execstr\" 2>&1`
 			code=$?
 			if [ "$code" == "0" ]
 			then
@@ -282,7 +277,7 @@ fi
 fi
 
 # clean up tmp config file
-if [ "$dbusername" != "" ]
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]
 then
 	## clean up tmp config file
 	debug "rm $mycnf"