X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gnt-lv-snap-rsync.sh;h=869a7b33253f32d4680acbe16d9ffcb47a13aef1;hb=985e9c8ea3e02f40bffeca33275e0db76d1f3ea4;hp=276e682ce1cfd76d4a31b37e1777674b67d2c1bb;hpb=5402724c9f5058da0c73cc8f042ef3adde277677;p=gnt-info

diff --git a/gnt-lv-snap-rsync.sh b/gnt-lv-snap-rsync.sh
index 276e682..869a7b3 100755
--- a/gnt-lv-snap-rsync.sh
+++ b/gnt-lv-snap-rsync.sh
@@ -1,31 +1,68 @@
 #!/bin/sh -e
 
-instance=pauk
-disk=2
+instance=$1
+disk=$2
+test -z "$backup" && backup="backup"
+
+if [ "$1" = '-' ] ; then
+	read instance disk
+elif [ -z "$instance" -o -z "$disk" ] ; then
+	echo "Usage: $0 instance disk"
+	exit 1
+fi
+
+test -z "$instance" && exit 1
+
+instance=`gnt-instance list --no-headers -o name $instance | head -1`
 
-instance=`gnt-instance list --no-headers -o name $instance`
 node=`gnt-instance list -o pnode --no-headers $instance`
 echo "# $instance on $node"
 
+vg=`gnt-cluster info | grep 'lvm volume group:' | cut -d: -f2 | tr -d ' '`
+
+found_lvm=0
+
 ssh $node lvs -o name,tags | grep $instance | tee /dev/shm/$instace.$node.lvs | grep disk${disk}_data | while read lv origin ; do
+	found_lvm=1
+
 	disk_nr=`echo $lv | cut -d. -f2 | tr -d a-z_`
 	echo "# $lv | $origin | $disk_nr"
 
-cat <<__SHELL__ | tee /dev/shm/$instance.sh
-	lvcreate -L20480m -s -n$lv.snap /dev/ffzgvg/$lv
+	rsync_args=""
+	if rsync lib15::$backup/$instance/rsync.args /dev/shm/$instance-rsync.args 2>/dev/null; then
+		rsync_args="`cat /dev/shm/$instance-rsync.args`"
+	fi
+
+cat <<__SHELL__ > /dev/shm/$instance.sh
+
+	lvcreate -L20480m -s -n$lv.snap /dev/$vg/$lv
+
 	mkdir /dev/shm/$lv.snap
-	mount /dev/ffzgvg/$lv.snap /dev/shm/$lv.snap -o ro
-	rsync -ravHz --numeric-ids --sparse --delete /dev/shm/$lv.snap/ lib15::backup/$instance/$disk_nr/
+
+	# we must mount filesystem read-write to allow journal recovery
+	offset=\`fdisk -l /dev/$vg/$lv.snap -u | grep Linux$ | grep /dev/$vg/$lv.snap | head -1 | sed 's/\*/ /' | awk '{ print \$2 * 512 }'\`
+	test ! -z "\$offset" && offset=",offset=\$offset"
+	mount /dev/$vg/$lv.snap /dev/shm/$lv.snap -o noatime\$offset
+
+	rsync -ravHzXA --inplace --numeric-ids --delete $rsync_args /dev/shm/$lv.snap/ lib15::$backup/$instance/$disk_nr/
+
 	umount /dev/shm/$lv.snap
-	lvremove -f /dev/ffzgvg/$lv.snap
+
+	lvremove -f /dev/$vg/$lv.snap
+
+	rmdir /dev/shm/$lv.snap
+	rm -v /dev/shm/$instance.sh
 __SHELL__
 
 	scp /dev/shm/$instance.sh $node:/dev/shm/$instance.sh
 
 	ssh $node sh -xe /dev/shm/$instance.sh
 
-	date=`date +%Y-%m-%d`
-	ssh lib15 zfs snap lib15/backup/$instance/$disk_nr@$date
+	# execute zfs snap on lib15 via ssh command="" wrapper
+	ssh -i /root/.ssh/id_dsa-zfs lib15 lib15/$backup/$instance/$disk_nr
 done
 
-
+if [ $found_lvm = 0 ] ; then
+	export backup
+	/srv/gnt-info/rbd-snap-backup.sh $instance $disk
+fi