change location of zfs snap key

[gnt-info] / gnt-lv-snap-rsync.sh

diff --git a/gnt-lv-snap-rsync.sh b/gnt-lv-snap-rsync.sh
index 85722ba..9928924 100755 (executable)
--- a/gnt-lv-snap-rsync.sh
+++ b/gnt-lv-snap-rsync.sh
@@ -2,40 +2,67 @@
 
 instance=$1
 disk=$2
+test -z "$backup" && backup="backup"
 
-if [ -z "$instance" -o -z "$disk" ] ; then
+if [ "$1" = '-' ] ; then
+       read instance disk
+elif [ -z "$instance" -o -z "$disk" ] ; then
        echo "Usage: $0 instance disk"
        exit 1
 fi
 
-instance=`gnt-instance list --no-headers -o name $instance`
+test -z "$instance" && exit 1
+
+instance=`gnt-instance list --no-headers -o name $instance | head -1`
 
 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
+
        # 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 | 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 -ravHzXA --inplace --numeric-ids --delete $rsync_args /dev/shm/$lv.snap/ lib15::$backup/$instance/$disk_nr/
 
-       rsync -ravHz --numeric-ids --sparse --delete /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 /etc/ganeti/id_dsa-zfs-snap lib15 lib15/$backup/$instance/$disk_nr
 done
 
-
+if [ $found_lvm = 0 ] ; then
+       export backup
+       /srv/gnt-info/rbd-snap-backup.sh $instance $disk
+fi