projects
/
gnt-info
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish machine setup to test upgrade
[gnt-info]
/
gnt-lv-snap-rsync.sh
diff --git
a/gnt-lv-snap-rsync.sh
b/gnt-lv-snap-rsync.sh
index
d7224dd
..
4fbc415
100755
(executable)
--- a/
gnt-lv-snap-rsync.sh
+++ b/
gnt-lv-snap-rsync.sh
@@
-3,6
+3,7
@@
instance=$1
disk=$2
test -z "$backup" && backup="backup"
instance=$1
disk=$2
test -z "$backup" && backup="backup"
+test -z "$rsync_server" && rsync_server="lib15"
if [ "$1" = '-' ] ; then
read instance disk
if [ "$1" = '-' ] ; then
read instance disk
@@
-18,26
+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"
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"
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
cat <<__SHELL__ > /dev/shm/$instance.sh
- lvcreate -L20480m -s -n$lv.snap /dev/
ffzg
vg/$lv
+ lvcreate -L20480m -s -n$lv.snap /dev/
$
vg/$lv
mkdir /dev/shm/$lv.snap
# we must mount filesystem read-write to allow journal recovery
mkdir /dev/shm/$lv.snap
# we must mount filesystem read-write to allow journal recovery
- offset=\`fdisk -l /dev/
ffzgvg/$lv.snap -u | grep Linux$ | grep /dev/ffzg
vg/$lv.snap | head -1 | sed 's/\*/ /' | awk '{ print \$2 * 512 }'\`
+ 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"
test ! -z "\$offset" && offset=",offset=\$offset"
- mount /dev/
ffzg
vg/$lv.snap /dev/shm/$lv.snap -o noatime\$offset
+ mount /dev/
$
vg/$lv.snap /dev/shm/$lv.snap -o noatime\$offset
- rsync -ravHzXA --inplace --numeric-ids --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
umount /dev/shm/$lv.snap
- lvremove -f /dev/
ffzg
vg/$lv.snap
+ lvremove -f /dev/
$
vg/$lv.snap
rmdir /dev/shm/$lv.snap
rm -v /dev/shm/$instance.sh
rmdir /dev/shm/$lv.snap
rm -v /dev/shm/$instance.sh
@@
-47,8
+57,11
@@
__SHELL__
ssh $node sh -xe /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 $rsync_server via ssh command="" wrapper
+ ssh
-i /etc/ganeti/id_dsa-zfs-snap $rsync_server $rsync_server/$backup/$instance/$disk_nr
done
done
-
+if [ $found_lvm = 0 ] ; then
+ export backup
+ /srv/gnt-info/rbd-snap-backup.sh $instance $disk
+fi