From 1fda206fa22dc2f97faf90e96ecd4cd8955d2cf1 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 27 Feb 2012 18:47:21 -0300 Subject: Rsync handler: using more debug/warning instead of regular echo (upstream #3840) --- handlers/rsync.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index e253c5c..a9dae06 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -405,7 +405,7 @@ function rotate_long { echo "Debug: $dir.1 does not exist, skipping." continue 1 elif [ ! -f $metadata.1/created ] && [ ! -f $metadata.1/rotated ]; then - echo "Warning: metadata does not exist for $dir.1. This backup may be only partially completed. Skipping rotation." + warning "Warning: metadata does not exist for $dir.1. This backup may be only partially completed. Skipping rotation." continue 1 fi @@ -425,7 +425,7 @@ function rotate_long { if [ ! $created -gt $cutoff_time ]; then next=$(( i + 1 )) if [ ! -d $dir.$next ]; then - echo "Debug: $rottype.$i --> $rottype.$next" + debug "$rottype.$i --> $rottype.$next" $nice mv $dir.$i $dir.$next mkdir -p $metadata.$next date +%c%n%s > $metadata.$next/rotated @@ -433,10 +433,10 @@ function rotate_long { $nice mv $metadata.$i/created $metadata.$next fi else - echo "Debug: skipping rotation of $dir.$i because $dir.$next already exists." + debug "skipping rotation of $dir.$i because $dir.$next already exists." fi else - echo "Debug: skipping rotation of $dir.$i because it was created" $(( (now-created)/86400)) "days ago ("$(( (now-cutoff_time)/86400))" needed)." + debug "skipping rotation of $dir.$i because it was created" $(( (now-created)/86400)) "days ago ("$(( (now-cutoff_time)/86400))" needed)." fi fi done @@ -444,7 +444,7 @@ function rotate_long { max=$((keepdaily+1)) if [ $keepweekly -gt 0 -a -d $backuproot/daily.$max -a ! -d $backuproot/weekly.1 ]; then - echo "Debug: daily.$max --> weekly.1" + debug "daily.$max --> weekly.1" $nice mv $backuproot/daily.$max $backuproot/weekly.1 mkdir -p $backuproot/metadata/weekly.1 date +%c%n%s > $backuproot/metadata/weekly.1/rotated @@ -455,7 +455,7 @@ function rotate_long { max=$((keepweekly+1)) if [ $keepmonthly -gt 0 -a -d $backuproot/weekly.$max -a ! -d $backuproot/monthly.1 ]; then - echo "Debug: weekly.$max --> monthly.1" + debug "weekly.$max --> monthly.1" $nice mv $backuproot/weekly.$max $backuproot/monthly.1 mkdir -p $backuproot/metadata/monthly.1 date +%c%n%s > $backuproot/metadata/monthly.1/rotated @@ -473,10 +473,10 @@ function rotate_long { for (( i=$oldest; i >= $max; i-- )); do if [ -d $dir.$i ]; then if [ -d $backuproot/rotate.tmp ]; then - echo "Debug: removing rotate.tmp" + debug "removing rotate.tmp" $nice rm -rf $backuproot/rotate.tmp fi - echo "Debug: moving $rottype.$i to rotate.tmp" + debug "moving $rottype.$i to rotate.tmp" $nice mv $dir.$i $backuproot/rotate.tmp fi done -- cgit v1.2.3 From 29286c7c3edefc3d77ea529bbe325718cace64db Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 6 Apr 2012 17:29:10 -0300 Subject: Quoting $starttime (upstream #3868) --- handlers/rsync.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 884a885..68ab392 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -830,7 +830,7 @@ function update_metadata { # finished, otherwise daily rotations might not take place. # If we used backup end time, in the next handler run # we might not have $now - $created >= 24:00 - echo $starttime > $metadata/created + echo "$starttime" > $metadata/created $touch $backupdir/$SECTION/$suffix else folder="`echo $dest_path | cut -d : -f 2`" @@ -844,7 +844,7 @@ function update_metadata { # finished, otherwise daily rotations might not take place. # If we used backup end time, in the next handler run # we might not have $now - $created >= 24:00 - echo $starttime > $metadata/created + echo "$starttime" > $metadata/created ##### END REMOTE SCRIPT ####### EOF ) | (while read a; do passthru $a; done) @@ -1111,7 +1111,7 @@ stop_services mount_rw starttime="`date +%c%n%s`" -echo "Starting backup at `echo $starttime | head -n 1`" >> $log +echo "Starting backup at `echo "$starttime" | head -n 1`" >> $log for SECTION in $include; do -- cgit v1.2.3 From e22107cf0954f29215052becf848bc28b47ffbe0 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 12 Apr 2012 20:49:04 -0300 Subject: Validate created date on long_rotation to avoid too many arguments at comparison (upstream #3868) --- handlers/rsync.in | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 68ab392..31449c2 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -421,6 +421,11 @@ function rotate_long { else created=0 fi + # Validate created date + if [ -z "$created" ] || echo $created | grep -v -q -e '^[0-9]*$'; then + warning "Invalid metatada $created. Skipping rotation." + break + fi cutoff_time=$(( now - (seconds*(i-1)) )) if [ ! $created -gt $cutoff_time ]; then next=$(( i + 1 )) @@ -539,6 +544,11 @@ function rotate_long_remote { else created=0 fi + # Validate created date + if [ -z "\$created" ] || echo \$created | grep -v -q -e '^[0-9]*$'; then + echo "Warning: Invalid metatada \$created. Skipping rotation." + break + fi cutoff_time=\$(( now - (seconds*(i-1)) )) if [ ! \$created -gt \$cutoff_time ]; then next=\$(( i + 1 )) -- cgit v1.2.3 From aa8d0f864830036e12e52696243c05df76d678e2 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 12 Apr 2012 21:29:57 -0300 Subject: Quoting $exclude and $excludes and avoiding a for loop on $exclude to not expand wildcards in beforehand (upstream #3882) --- handlers/rsync.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index e253c5c..a77da2a 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -277,9 +277,7 @@ function eval_config { mv=move_files fi - for path in $exclude; do - excludes="$excludes --exclude=$path" - done + excludes=`echo "$exclude" | sed -e 's/^/--exclude=/g' -e 's/ / --exclude=/g'` } @@ -1113,8 +1111,8 @@ for SECTION in $include; do set_dest info "Syncing $SECTION on $dest_path..." - debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path - $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path | tee -a $log + debug $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path + $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path | tee -a $log if [ "$?" != "0" ]; then fatal "Rsync error when trying to transfer $SECTION" -- cgit v1.2.3 From 5ea13f4c240cf4c8c9f96dc424a5a14acc709f51 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 13 Apr 2012 00:31:03 -0300 Subject: Using @SED@ for #3882 --- handlers/rsync.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index a77da2a..ad8e64f 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -277,7 +277,7 @@ function eval_config { mv=move_files fi - excludes=`echo "$exclude" | sed -e 's/^/--exclude=/g' -e 's/ / --exclude=/g'` + excludes=`echo "$exclude" | @SED@ 's/^/--exclude=/g' -e 's/ / --exclude=/g'` } -- cgit v1.2.3 From 39bb9e605f04665f8d838be442d9224745959872 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 13 Apr 2012 09:58:18 -0300 Subject: Trying additional quoting on excludes (upstream #3882) --- handlers/rsync.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index ad8e64f..3108b37 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -277,7 +277,7 @@ function eval_config { mv=move_files fi - excludes=`echo "$exclude" | @SED@ 's/^/--exclude=/g' -e 's/ / --exclude=/g'` + excludes=`echo "$exclude" | @SED@ "s/^/--exclude='/g" -e "s/ /' --exclude='/g" -e "s/$/'/"` } -- cgit v1.2.3 From bf5ada0f0357dd3b7500d03dd4a4a2f84282e8c1 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 10 May 2012 16:53:52 -0300 Subject: Changing remaining 'exit' to 'fatal' at rsync handler (#3721) --- handlers/rsync.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 884a885..cb72886 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -391,8 +391,7 @@ function rotate_long { local metadata if [ ! -d "$backuproot" ]; then - echo "Debug: skipping rotate of $backuproot as it doesn't exist." - exit + fatal "Skipping rotate of $backuproot as it doesn't exist." fi for rottype in daily weekly monthly; do @@ -509,7 +508,7 @@ function rotate_long_remote { now=\`date +%s\` if [ ! -d "$backuproot" ]; then - echo "Debug: skipping rotate of $backuproot as it doesn't exist." + echo "Fatal: skipping rotate of $backuproot as it doesn't exist." exit fi -- cgit v1.2.3 From ba3e37595d7a8fbf9a881ab0b9b14146eb91f3a2 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 10 May 2012 17:00:58 -0300 Subject: Changing a 'fatal' to a 'warning' on rsync handler. Using 'warning' and 'return' instead of a fatal at rotate_long if backuproot doesn't exist. Using a warning ensures that the backup action can process the other includes and not just exit. --- handlers/rsync.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index cb72886..6fcda05 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -391,7 +391,8 @@ function rotate_long { local metadata if [ ! -d "$backuproot" ]; then - fatal "Skipping rotate of $backuproot as it doesn't exist." + warning "Skipping rotate of $backuproot as it doesn't exist." + return fi for rottype in daily weekly monthly; do -- cgit v1.2.3 From 5af9b963715efa186feacd0314a793184cc0eea3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 10 May 2012 17:25:34 -0300 Subject: Removing duplicated locking support (#3838) --- handlers/rsync.in | 44 -------------------------------------------- 1 file changed, 44 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 884a885..3378819 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -39,7 +39,6 @@ # keepdaily = for long storage format, specify the number of daily backup increments # keepweekly = for long storage format, specify the number of weekly backup increments # keepmonthly = for long storage format, specify the number of monthly backup increments -# lockfile = lockfile to be kept during backup execution # nicelevel = rsync command nice level # enable_mv_timestamp_bug = set to "yes" if your system isnt handling timestamps correctly # tmp = temp folder @@ -129,7 +128,6 @@ function eval_config { getconf keepdaily 5 getconf keepweekly 3 getconf keepmonthly 1 - getconf lockfile getconf nicelevel 0 getconf enable_mv_timestamp_bug no getconf tmp /tmp @@ -875,45 +873,6 @@ function test_connect { } -function set_lockfile { - - if [ ! -z "$lockfile" ]; then - mkdir -p `dirname $lockfile` - if ( set -o noclobber; echo "$$" > "$lockfile" ) &> /dev/null; then - trap 'unset_lockfile' INT TERM EXIT - else - fatal "Could not create lockfile $lockfile, exiting" - fi - fi - -} - -function unset_lockfile { - - if [ ! -z "$lockfile" ]; then - $rm -f $lockfile || warning "Could not remove lockfile $lockfile" - fi - -} - -function check_lockfile { - - local pid process - - if [ ! -z "$lockfile" ] && [ -f "$lockfile" ]; then - pid="`cat $lockfile`" - process="`ps --no-headers -o comm $pid`" - if [ "$?" == "0" ] && [ "`ps --no-headers -o comm $$`" == "$process" ]; then - info "Another backup is running for $lockfile, skipping run" - exit - else - info "Found old lockfile $lockfile, removing it" - unset_lockfile - fi - fi - -} - function set_filelist { filelist_flag="" @@ -1103,8 +1062,6 @@ function end_mux { # the backup procedure eval_config -check_lockfile -set_lockfile set_rsync_options start_mux stop_services @@ -1136,7 +1093,6 @@ done mount_ro run_fsck start_services -unset_lockfile end_mux echo "Finnishing backup at `date`" >> $log -- cgit v1.2.3 From c43bac5911f8d97044b505466f21ed87f43d84fc Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 10 May 2012 18:47:11 -0300 Subject: Ensure that a non-zero rsync exit status is caught by our handler (#3892) --- handlers/rsync.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 884a885..73507c8 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -1121,6 +1121,9 @@ for SECTION in $include; do set_filelist set_dest + # Ensure that a non-zero rsync exit status is caught by our handler + set -o pipefail + info "Syncing $SECTION on $dest_path..." debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path | tee -a $log -- cgit v1.2.3 From fbf25018bea6b5cb630ee15b401b385d5e9f7084 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 10 May 2012 21:03:37 -0300 Subject: Set/restore pipefail to not mess with other scripts (#3892) --- handlers/rsync.in | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 73507c8..85e1c99 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -1100,6 +1100,28 @@ function end_mux { } +function set_pipefail { + + # Save initial pipefail status for later restoration + if echo "$SHELLOPTS" | grep -q ":pipefail"; then + pipefail="-o" + else + pipefail="+o" + fi + + # Ensure that a non-zero rsync exit status is caught by our handler + set -o pipefail + +} + +function restore_pipefail { + + if [ ! -z "$pipefail" ]; then + set $pipefail pipefail + fi + +} + # the backup procedure eval_config @@ -1109,6 +1131,7 @@ set_rsync_options start_mux stop_services mount_rw +set_pipefail starttime="`date +%c%n%s`" echo "Starting backup at `echo $starttime | head -n 1`" >> $log @@ -1121,9 +1144,6 @@ for SECTION in $include; do set_filelist set_dest - # Ensure that a non-zero rsync exit status is caught by our handler - set -o pipefail - info "Syncing $SECTION on $dest_path..." debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path | tee -a $log @@ -1136,6 +1156,7 @@ for SECTION in $include; do done +restore_pipefail mount_ro run_fsck start_services -- cgit v1.2.3 From b7a92b20f8c139fff7e0febc0275c25c5c254d94 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 10 May 2012 21:26:38 -0300 Subject: Fixing typos (#3868) --- handlers/rsync.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 31449c2..5d8c777 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -423,7 +423,7 @@ function rotate_long { fi # Validate created date if [ -z "$created" ] || echo $created | grep -v -q -e '^[0-9]*$'; then - warning "Invalid metatada $created. Skipping rotation." + warning "Invalid metadata $created. Skipping rotation." break fi cutoff_time=$(( now - (seconds*(i-1)) )) @@ -546,7 +546,7 @@ function rotate_long_remote { fi # Validate created date if [ -z "\$created" ] || echo \$created | grep -v -q -e '^[0-9]*$'; then - echo "Warning: Invalid metatada \$created. Skipping rotation." + echo "Warning: Invalid metadata \$created. Skipping rotation." break fi cutoff_time=\$(( now - (seconds*(i-1)) )) -- cgit v1.2.3 From 118d7587b6d4ad34224b7bf7370bdfbe941ffe3c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 12 May 2012 21:48:43 -0300 Subject: Changing pipefail just when it's really needed --- handlers/rsync.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index 85e1c99..1f7fb4d 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -1131,7 +1131,6 @@ set_rsync_options start_mux stop_services mount_rw -set_pipefail starttime="`date +%c%n%s`" echo "Starting backup at `echo $starttime | head -n 1`" >> $log @@ -1146,17 +1145,18 @@ for SECTION in $include; do info "Syncing $SECTION on $dest_path..." debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path + set_pipefail $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path | tee -a $log if [ "$?" != "0" ]; then fatal "Rsync error when trying to transfer $SECTION" fi + restore_pipefail update_metadata done -restore_pipefail mount_ro run_fsck start_services -- cgit v1.2.3 From 7c66b699f5820a9fab997a98d95e2852dd21a262 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 14 May 2012 16:30:02 +0200 Subject: Always use explicit sed's -e. Hopefully this fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656968#31 and future incarnations of this class of bugs. --- handlers/rsync.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'handlers') diff --git a/handlers/rsync.in b/handlers/rsync.in index c5c7cac..2d00267 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -275,7 +275,7 @@ function eval_config { mv=move_files fi - excludes=`echo "$exclude" | @SED@ "s/^/--exclude='/g" -e "s/ /' --exclude='/g" -e "s/$/'/"` + excludes=`echo "$exclude" | @SED@ -e "s/^/--exclude='/g" -e "s/ /' --exclude='/g" -e "s/$/'/"` } @@ -406,7 +406,7 @@ function rotate_long { fi # Rotate the current list of backups, if we can. - oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1` + oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1` [ "$oldest" == "" ] && oldest=0 for (( i=$oldest; i > 0; i-- )); do if [ -d $dir.$i ]; then @@ -468,7 +468,7 @@ function rotate_long { for rottype in daily weekly monthly; do max=$((keep${rottype}+1)) dir="$backuproot/$rottype" - oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1` + oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1` [ "$oldest" == "" ] && oldest=0 # if we've rotated the last backup off the stack, remove it. for (( i=$oldest; i >= $max; i-- )); do @@ -529,7 +529,7 @@ function rotate_long_remote { fi # Rotate the current list of backups, if we can. - oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1\` + oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1\` [ "\$oldest" == "" ] && oldest=0 for (( i=\$oldest; i > 0; i-- )); do if [ -d \$dir.\$i ]; then @@ -591,7 +591,7 @@ function rotate_long_remote { for rottype in daily weekly monthly; do max=\$((keep\${rottype}+1)) dir="$backuproot/\$rottype" - oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1\` + oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1\` [ "\$oldest" == "" ] && oldest=0 # if we've rotated the last backup off the stack, remove it. for (( i=\$oldest; i >= \$max; i-- )); do -- cgit v1.2.3 From d464a9742dd45202e86432714288330417cd415f Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 May 2012 16:58:25 +0200 Subject: Have "make dist" package handlers/*.in instead of make results. --- ChangeLog | 1 + handlers/Makefile.am | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'handlers') diff --git a/ChangeLog b/ChangeLog index 32eb5cd..f694af5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ version 1.0 -- UNRELEASED . Workaround automake sanity check that would prevent us from installing lib/* into lib/backupninja/. Where else are be supposed to install such files anyway? + . Have "make dist" ship handlers/*.in instead of make results. documentation changes . Document what features available to .sh jobs (Redmine #1558). diff --git a/handlers/Makefile.am b/handlers/Makefile.am index 54155e8..6c1969b 100644 --- a/handlers/Makefile.am +++ b/handlers/Makefile.am @@ -3,16 +3,20 @@ HANDLERS = dup dup.helper maildir makecd \ makecd.helper mysql mysql.helper pgsql pgsql.helper rdiff \ rdiff.helper rsync sh svn sys sys.helper trac tar tar.helper +DIST_HANDLERS = dup.in dup.helper.in maildir.in makecd.in \ + makecd.helper.in mysql.in mysql.helper.in pgsql.in pgsql.helper.in rdiff.in \ + rdiff.helper.in rsync.in sh.in svn.in sys.in sys.helper.in trac.in tar.in tar.helper.in wget + CLEANFILES = $(HANDLERS) -EXTRA_DIST = Makefile.am $(HANDLERS) +EXTRA_DIST = Makefile.am $(DIST_HANDLERS) edit = sed \ -e "s,@BASH\@,$(BASH),g" \ -e "s,@AWK\@,$(AWK),g" \ -e "s,@SED\@,$(SED),g" -dist_pkgdata_DATA = $(HANDLERS) +dist_pkgdata_DATA = $(DIST_HANDLERS) dup: $(srcdir)/dup.in rm -f dup -- cgit v1.2.3 From 7e6a79c3d2fa908d76df5be9dd834e64f07f2481 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 May 2012 17:43:09 +0200 Subject: Install handlers as pkgdata_DATA, instead of their .in files. --- ChangeLog | 1 + handlers/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'handlers') diff --git a/ChangeLog b/ChangeLog index 0b2bf40..47dde53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ version 1.0 -- UNRELEASED to install such files anyway? . Have "make dist" ship handlers/*.in instead of make results. . Have "make dist" ship the FAQ. + . Install handlers as pkgdata_DATA, instead of their .in files. documentation changes . Document what features available to .sh jobs (Redmine #1558). diff --git a/handlers/Makefile.am b/handlers/Makefile.am index 6c1969b..bad53bb 100644 --- a/handlers/Makefile.am +++ b/handlers/Makefile.am @@ -16,7 +16,7 @@ edit = sed \ -e "s,@AWK\@,$(AWK),g" \ -e "s,@SED\@,$(SED),g" -dist_pkgdata_DATA = $(DIST_HANDLERS) +pkgdata_DATA = $(HANDLERS) dup: $(srcdir)/dup.in rm -f dup -- cgit v1.2.3 From b05065625c76c271448f493f515558cbe00b34ac Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 20 May 2012 13:11:12 +0200 Subject: mysql: use --skip-events when backing up the performance_schema database (Closes: #673572) --- AUTHORS | 1 + ChangeLog | 6 ++++++ handlers/mysql.in | 13 +++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) (limited to 'handlers') diff --git a/AUTHORS b/AUTHORS index 1319688..4e7299b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,3 +43,4 @@ aihtdikh -- Allow 'when = XXX' with spaces in .sh files. Chris Lamb -- rdiff.helper bugfix Yuval Kogman -- RackSpace's CloudFiles support for duplicity exobuzz - mysql bugfixes +Glennie Vignarajah -- mysql bugfix diff --git a/ChangeLog b/ChangeLog index 209eacf..f2c9270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +version 1.0 -- UNRELEASED + handler changes + mysql: + . Use --skip-events when backing up the performance_schema database. + (Closes: #673572) + version 1.0-rc1 -- May 15, 2012 handler changes dup: diff --git a/handlers/mysql.in b/handlers/mysql.in index 65deebb..6ade49e 100644 --- a/handlers/mysql.in +++ b/handlers/mysql.in @@ -256,10 +256,15 @@ then for db in $databases do DUMP_BASE="$MYSQLDUMP $defaultsfile $sqldumpoptions" - if [ "$db" = "information_schema" ] || [ "$db" = "performance_schema" ] - then - DUMP_BASE="${DUMP_BASE} --skip-lock-tables" - fi + + case "$db" in + information_schema) + DUMP_BASE="${DUMP_BASE} --skip-lock-tables" + ;; + performance_schema) + DUMP_BASE="${DUMP_BASE} --skip-lock-tables --skip-events" + ;; + esac # Dumping structure and data DUMP="$DUMP_BASE $ignore $db" -- cgit v1.2.3