projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3569@krups: intrigeri | 2005-11-17 22:34:04 +0100
[matthijs/upstream/backupninja.git]
/
handlers
/
mysql
diff --git
a/handlers/mysql
b/handlers/mysql
index a4a1497d35195acce702b887d0a1b4c266d855ba..569b0a206d21dc4b509539fd969c2ce6e9d181e3 100644
(file)
--- a/
handlers/mysql
+++ b/
handlers/mysql
@@
-4,6
+4,7
@@
getconf backupdir /var/backups/mysql
getconf databases all
getconf backupdir /var/backups/mysql
getconf databases all
+getconf ignores
getconf dbhost localhost
getconf hotcopy no
getconf sqldump no
getconf dbhost localhost
getconf hotcopy no
getconf sqldump no
@@
-21,14
+22,22
@@
if [ "$user" == "" ]; then
user=root;
else
userset=true;
user=root;
else
userset=true;
- userhome=`g
rep "^$user:" /etc/passwd
| awk -F: '{print $6}'`
+ userhome=`g
etent passwd "$user"
| awk -F: '{print $6}'`
[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
fi
[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
fi
+## Prepare ignore part of the command
+## This only works for mysqldump at the moment
+
+ignore=''
+for i in $ignores; do
+ ignore="$ignore --ignore-table=$i"
+done
+
# If vservers are configured, decide if the handler should
# use them or if it should just operate on the host
# If vservers are configured, decide if the handler should
# use them or if it should just operate on the host
-if [ "$
VSERVERS
" = "yes" ]
+if [ "$
vservers
" = "yes" ]
then
if [ ! -z $vsname ]
then
then
if [ ! -z $vsname ]
then
@@
-39,11
+48,16
@@
then
fi
fi
fi
fi
-#
Check to make sure that the specified vserver exists
+#
If needed, make sure that the specified vserver exists and is running.
if [ $usevserver ]
then
if [ $usevserver ]
then
+ info "examining vserver '$vsname'"
+ # does it exist ?
vroot="$VROOTDIR/$vsname"
[ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
vroot="$VROOTDIR/$vsname"
[ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
+ # is it running ?
+ running=`$VSERVERINFO $vsname RUNNING`
+ [ $running = 1 ] || fatal "vserver $vsname is not running."
fi
# create backup dirs, the vroot variable will be empty if no vsname was specified
fi
# create backup dirs, the vroot variable will be empty if no vsname was specified
@@
-81,7
+95,7
@@
fi
defaultsfile=""
if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
defaultsfile=""
if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
- home=`g
rep '^root:' /etc/passwd
| awk -F: '{print $6}'`
+ home=`g
etent passwd "root"
| awk -F: '{print $6}'`
[ -d $home ] || fatal "Can't find root's home directory ($home)."
mycnf="$home/.my.cnf"
if [ -f $mycnf ]; then
[ -d $home ] || fatal "Can't find root's home directory ($home)."
mycnf="$home/.my.cnf"
if [ -f $mycnf ]; then
@@
-176,9
+190,9
@@
if [ "$sqldump" == "yes" ]; then
for db in $databases; do
if [ $usevserver ]
then
for db in $databases; do
if [ $usevserver ]
then
- execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $vroot$dumpdir/${db}.sql"
+ execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $
ignore $
db > $vroot$dumpdir/${db}.sql"
else
else
- execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $dumpdir/${db}.sql"
+ execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $
ignore $
db > $dumpdir/${db}.sql"
fi
debug "su $user -c '$execstr'"
if [ ! $test ]; then
fi
debug "su $user -c '$execstr'"
if [ ! $test ]; then