X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=46f72c3ae64c8331fd46e7efa41c39bacbf74fff;hb=fd7b2438b6b32f72462ebc4238800bea70aaf308;hp=5e0cfb57f2da14b07593638a099a2a2a4c959db9;hpb=265046e79d6e6e38e9c2e3eb660a054f6db296cd;p=backup.sh

diff --git a/backup.sh b/backup.sh
index 5e0cfb5..46f72c3 100755
--- a/backup.sh
+++ b/backup.sh
@@ -44,56 +44,61 @@ fi
 
 # Die more or less gracefully (at least notify user)
 die() {
-	echo `date`": Something nasty happened."
+	warnmsg "Aborting."
 	rm $LOCKFILE
 	exit 1
 }
 diemsg() {
-	echo `date`": $computer: $@"
+	warnmsg "$@"
 	die
 }
+warnmsg() {
+	echo `date`": $computer: $@"
+	echo `date`": $computer: $@" >&2
+}
+infomsg() {
+	echo `date`": $computer: $@" >&2
+}
 
 # Trap C-c and kill
 trap die SIGINT SIGTERM
 
 # Don't start if we're already running
 if [ -e $LOCKFILE ]; then
-	echo `date`": $LOCKFILE exists for pid `cat $LOCKFILE`, exiting."
-	echo `date`": $LOCKFILE exists for pid `cat $LOCKFILE`, exiting." >&2
-	exit 1
+	diemsg "$LOCKFILE exists for pid `cat $LOCKFILE`."
 fi;
 touch $LOCKFILE
 echo $$ > $LOCKFILE
 
-echo `date`": Backup run starting" >&2
+infomsg "Backup run starting"
 
 umask 027
 
-
 backup()
 {
-	echo -n `date` >&2
-	printf " $computer: $computer:$filesystem $backuplevel backup\n" >&2
+	infomsg "$computer:$filesystem $backuplevel backup"
 
-	SNARFILE="${storagedir}/${computer}/${sfilesystem}/.incremental.snar"
-	incrementalsnar="/root/.backup/${sfilesystem}.snar"
-	if [ "$backuplevel" = "daglig" ]
-	then
+	localsnar="${storagedir}/${computer}/${sfilesystem}/.incremental.snar"
+	remotesnar="/root/.backup/${sfilesystem}.snar"
+	if [ "$backuplevel" = "daglig" ]; then
 		# If incremental backup, we need to copy the incremental status to $computer.
 		# If it does not exist, whine a bit and then run date-based instead.
-		if [ -s "$SNARFILE" ]; then
-			if ! scp $SNARFILE root@$computer:$incrementalsnar; then
+		if [ -s "$localsnar" ]; then
+			if ! scp $localsnar root@$computer:$remotesnar; then
 				diemsg "Could not copy .incremental.snar to $computer"
 			fi
-			lastcmd="--listed-incremental=$incrementalsnar --no-check-device"
+			lastcmd="--listed-incremental=$remotesnar --no-check-device"
 		else
-			echo `date`" $computer: Missing incremental.snar for $filesystem, doing date-based backup instead until next full backup" >&2
-			incrementalsnar=""
+			infomsg "Missing incremental.snar for $filesystem, doing date-based backup instead until next full backup"
+			remotesnar=""
 			lastd=`cat ../.date`
 			lastcmd="--newer='$lastd'"
 		fi
 	else
-		lastcmd="--listed-incremental=$incrementalsnar"
+		# Note: Since we rm-ed .backup previously, and we don't scp over
+		# anything in this branch, this file will not exist, and we
+		# will be doing a full backup (but we want the output of it).
+		lastcmd="--listed-incremental=$remotesnar"
 	fi
 
 	# We try to run tar on the remote computer
@@ -109,22 +114,22 @@ backup()
 	TARFILE=$DATE.tmp
 	TARCMD="ssh root@$computer \"nice -n 19 ionice -c3 tar --one-file-system --use-compress-program $compressor -cf - -C $filesystem . $lastcmd \
 		--exclude-from=/root/.backup/exclude\" | pee \"cat > $TARFILE\" \"tar tzvf -\""
-	echo `date`" $computer: Running $TARCMD" >&2
+	infomsg "Running $TARCMD"
 	eval $TARCMD > $DATE.idx
 
 	if [ $? -eq 0 ] && [ -s $TARFILE ]; then
 		# File is >0 in size and neither cat or tar tzvf failed; we assume it worked.
  
-		if [ "$incrementalsnar" ]; then
-			if ! scp root@$computer:$incrementalsnar $SNARFILE.tmp; then
+		if [ "$remotesnar" ]; then
+			if ! scp root@$computer:$remotesnar $localsnar.tmp; then
 				diemsg "Could not copy .incremental.snar from $computer"
 			fi
 		fi
 
 		# Move tar file in place
 		mv $TARFILE $DATE.tgz
-		if [ "$incrementalsnar" ]; then
-			mv $SNARFILE.tmp $SNARFILE
+		if [ "$remotesnar" ]; then
+			mv $localsnar.tmp $localsnar
 		fi
 
 		# Update timestamp
@@ -149,18 +154,18 @@ backup()
 # Check that the target filesystem is mounted (actually check that it's not
 # the root filesystem)
 if [ ! -d "$storagedir/$computer" ]; then
-	diemsg "Target filesystem ($storagedir/$computer) does not exist. Aborting"
+	diemsg "Target filesystem ($storagedir/$computer) does not exist."
 fi
 rootfilesystem=`df -P /`
 targetfilesystem=`df -P "$storagedir/$computer"`
 if [ "$rootfilesystem" == "$targetfilesystem" ]; then
-	diemsg "Target filesystem ($storagedir/$computer) was mounted on /. Aborting"
+	diemsg "Target filesystem ($storagedir/$computer) was mounted on /."
 fi
 
-echo `date`" $computer: Backing up $computer" >&2
+infomsg "Backing up $computer"
 
 # Try to SSH to the computer without entering a password.
-if ! `ssh -n -o NumberOfPasswordPrompts=0 root@$computer /bin/true`; then
+if ! ssh -n -o NumberOfPasswordPrompts=0 root@$computer /bin/true; then
 	diemsg "Could not use passwordless SSH."
 fi
 
@@ -168,7 +173,7 @@ fi
 if ssh -n root@$computer "pigz -V 2>/dev/null"; then
 	compressor=pigz
 else
-	echo `date`" $computer: pigz missing; falling back to gzip."
+	infomsg "pigz missing; falling back to gzip."
 	compressor=gzip
 fi
 
@@ -217,8 +222,7 @@ for filesystem in $filesystems; do
 	# Default backuplevel
 	backuplevel=daglig
 
-	if [ ! -s $storagedir/$computer/$sfilesystem/.date ]
-	then
+	if [ ! -s $storagedir/$computer/$sfilesystem/.date ]; then
 		# Take the first full backup of this filesystem on this computer
 		backuplevel=full
 	fi
@@ -260,7 +264,7 @@ for filesystem in $filesystems; do
 	# Delete old full backups
 	for full in `ls -1t $storagedir/$computer/$sfilesystem/full/*tgz | tail -n +$mf`; do
 		prefix=`echo $full | sed "s/\.[^.]*$//"`
-		echo `date`": $computer:$filesystem Deleting full backup $prefix" >&2
+		infomsg "$computer:$filesystem Deleting full backup $prefix"
 		rm $prefix*
 	done
 
@@ -278,9 +282,9 @@ done
 if ! ssh root@$computer "[ ! -f /root/.backup/postexec ] || /bin/bash -x /root/.backup/postexec" >&2; then
 	diemsg "Could not run $computer:/root/.backup/postexec"
 fi
-	
-echo `date`": $computer: Backup completed successfully."
-echo `date`": $computer: Backup completed successfully." >&2
+
+# Use warn so that we will get an email even on success.
+warnmsg "Backup completed successfully."
 
 # Remove lockfile
 rm $LOCKFILE