store lvm tag originstname from ganeti

diff --git a/bin/list b/bin/list
index 4fb2959..c12304c 100755 (executable)
--- a/bin/list
+++ b/bin/list
@@ -2,4 +2,4 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 

-zfs list -r $EXTP_ZFS -o name,logicalused,used,available,refer
+zfs list -r $EXTP_ZFS -o name,logicalused,used,available,refer,ganeti:originstname

diff --git a/sbin/lvchange b/sbin/lvchange
index b5e3ef5..ff94ea3 100755 (executable)
--- a/sbin/lvchange
+++ b/sbin/lvchange
@@ -5,12 +5,23 @@
 # run lvchange for local vg only
 if echo $* | grep -q $EXTP_VG ; then
        test -d /dev/$EXTP_VG || mkdir /dev/$EXTP_VG
 # run lvchange for local vg only
 if echo $* | grep -q $EXTP_VG ; then
        test -d /dev/$EXTP_VG || mkdir /dev/$EXTP_VG

+       case $1 in
+       -ay)

        VOL_NAME=`echo $2 | cut -d/ -f4`
        dev=`readlink --canonicalize /dev/zvol/$EXTP_ZFS/$VOL_NAME`
        if [ -e "$dev" ] ; then
                ln -svf $dev $2
                ls -al $2
        fi
        VOL_NAME=`echo $2 | cut -d/ -f4`
        dev=`readlink --canonicalize /dev/zvol/$EXTP_ZFS/$VOL_NAME`
        if [ -e "$dev" ] ; then
                ln -svf $dev $2
                ls -al $2
        fi

+       ;;
+       --addtag)
+               VOL_NAME=`echo $3 | cut -d/ -f4`
+               zfs set lv:tag=$2 $EXTP_ZFS/$VOL_NAME # FIXME duplicate?
+               tag=`echo $2 | cut -d+ -f1`
+               val=`echo $2 | cut -d+ -f2-`
+               zfs set ganeti:$tag=$val $EXTP_ZFS/$VOL_NAME
+       ;;
+       esac

 else
        /sbin/lvm lvchange $*
 fi
 else
        /sbin/lvm lvchange $*
 fi

diff --git a/t/lvchange b/t/lvchange
index bd734c9..be9fe1d 100644 (file)
--- a/t/lvchange
+++ b/t/lvchange
@@ -1 +1,2 @@
-lvchange -ay /dev/ffzgvg/e4bf0e9d-2c6e-4e1c-8bc4-342ee94724a5.disk0
+# lvchange -ay /dev/ffzgvg/e4bf0e9d-2c6e-4e1c-8bc4-342ee94724a5.disk0
+lvchange --addtag originstname+t-drbd /dev/ffzgvg/5e8966e5-3aa4-4ba4-9c9a-cb2a0ee5b98b.disk0_meta