X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gnt-lv-snap-rsync.sh;h=4fbc4156efeeb8094a7d27ffcc380c88c4099c32;hb=4b828e39660e81f575ab7dcd235eb3e526ebe6b6;hp=6c37329f01325a22d2b880c8b8b17cc7c2b49308;hpb=7664adfd24807a0002d6c732a578dd9518c730a3;p=gnt-info

diff --git a/gnt-lv-snap-rsync.sh b/gnt-lv-snap-rsync.sh
index 6c37329..4fbc415 100755
--- a/gnt-lv-snap-rsync.sh
+++ b/gnt-lv-snap-rsync.sh
@@ -2,6 +2,8 @@
 
 instance=$1
 disk=$2
+test -z "$backup" && backup="backup"
+test -z "$rsync_server" && rsync_server="lib15"
 
 if [ "$1" = '-' ] ; then
 	read instance disk
@@ -17,28 +19,35 @@ instance=`gnt-instance list --no-headers -o name $instance | head -1`
 node=`gnt-instance list -o pnode --no-headers $instance`
 echo "# $instance on $node"
 
-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=0
+
+ssh $node lvs -o name,tags,vg_name | grep $instance | tee /dev/shm/$instace.$node.lvs | grep disk${disk}_data | while read lv origin vg ; do
+	found_lvm=1
+
 	disk_nr=`echo $lv | cut -d. -f2 | tr -d a-z_`
 	echo "# $lv | $origin | $disk_nr"
 
+	rsync_args=""
+	if rsync $rsync_server::$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/ffzgvg/$lv
+	lvcreate -L20480m -s -n$lv.snap /dev/$vg/$lv
 
 	mkdir /dev/shm/$lv.snap
 
-	sleep 1
-
 	# we must mount filesystem read-write to allow journal recovery
-	mount /dev/ffzgvg/$lv.snap /dev/shm/$lv.snap -o noatime \
-	|| offset=\`fdisk -l /dev/ffzgvg/$lv.snap -u | grep Linux$ | grep /dev/ffzgvg/$lv.snap | head -1 | sed 's/\*/ /' | awk '{ print \$2 * 512 }'\` \
-	&& mount /dev/ffzgvg/$lv.snap /dev/shm/$lv.snap -o noatime,offset=\$offset \
+	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 -ravHz --numeric-ids --sparse --delete /dev/shm/$lv.snap/ lib15::backup/$instance/$disk_nr/
+	rsync -ravHzXA --inplace --numeric-ids --delete $rsync_args /dev/shm/$lv.snap/ $rsync_server::$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
@@ -48,8 +57,11 @@ __SHELL__
 
 	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 $rsync_server via ssh command="" wrapper
+	ssh -i /etc/ganeti/id_dsa-zfs-snap $rsync_server $rsync_server/$backup/$instance/$disk_nr
 done
 
-
+if [ $found_lvm = 0 ] ; then
+	export backup
+	/srv/gnt-info/rbd-snap-backup.sh $instance $disk
+fi