From: Dobrica Pavlinusic Date: Tue, 1 Jul 2014 20:44:28 +0000 (+0200) Subject: gnt-node volumes now works! X-Git-Url: http://git.rot13.org/?p=ganeti-extstorage-zfs;a=commitdiff_plain;h=80d331a6211b24923d5286e681f22812918a1611 gnt-node volumes now works! --- diff --git a/sbin/lvs b/sbin/lvs index 013d8d0..7a912f2 100755 --- a/sbin/lvs +++ b/sbin/lvs @@ -21,6 +21,13 @@ if echo $* | grep -q vg_name,lv_name,lv_size,lv_attr ; then awk '{ print " '$EXTP_VG'|"$1"|" $2 / 1024 / 1024 "|"$3"wi-a"$4"--" }' /sbin/lvm lvs $* 2>/dev/null || exit 0 # local, might fail +# gnt-node volumes +# lvs --noheadings --units=m --nosuffix '--separator=|' --options=lv_name,lv_size,devices,vg_name +elif echo $* | grep -q lv_name,lv_size,devices,vg_name ; then + zfs list -o name,volsize -t volume -r $EXTP_ZFS -H -p | sed "s:$EXTP_ZFS/*::" | \ + awk '{ print " "$1"|" $2 / 1024 / 1024 "|zfs|'$EXTP_VG'" }' + /sbin/lvm lvs $* 2>/dev/null || exit 0 # local, might fail + # gnt-instance modify -t drbd -n box02 zfs # lvs --noheadings '--separator=|' --units=k --nosuffix -olv_attr,lv_kernel_major,lv_kernel_minor,vg_extent_size,stripes,devices /dev/ffzgvg/c72d9ea7-f396-4104-b4ee-8b613da32051.disk1 elif echo $* | grep -q lv_attr,lv_kernel_major,lv_kernel_minor,vg_extent_size,stripes,devices ; then diff --git a/t/lvs b/t/lvs index c0505d3..7ff581a 100644 --- a/t/lvs +++ b/t/lvs @@ -1,6 +1,8 @@ #lvs --noheadings '--separator=|' --units=k --nosuffix -olv_attr,lv_kernel_major,lv_kernel_minor,vg_extent_size,stripes,devices /dev/ffzgvg/c72d9ea7-f396-4104-b4ee-8b613da32051.disk1 #lvs --noheadings '--separator=|' --units=k --nosuffix -olv_attr,lv_kernel_major,lv_kernel_minor,vg_extent_size,stripes,devices /dev/ffzgvg/3e6746a9-cb99-4584-a219-af7e4b5cb5f5.disk0_data -lvs --noheadings --units=m --nosuffix '--separator=|' -ovg_name,lv_name,lv_size,lv_attr -lvs --noheadings --units=m --nosuffix '--separator=|' -ovg_name,lv_name,lv_size,lv_attr ffzgvg +#lvs --noheadings --units=m --nosuffix '--separator=|' -ovg_name,lv_name,lv_size,lv_attr +#lvs --noheadings --units=m --nosuffix '--separator=|' -ovg_name,lv_name,lv_size,lv_attr ffzgvg #lvs -o tags --noheadings --nosuffix /dev/ffzgvg/88c6b19f-7b3f-4041-bb9c-d2a0716e459c.disk0 -lvs --noheadings '--separator=|' --units=k --nosuffix -olv_attr,lv_kernel_major,lv_kernel_minor,vg_extent_size,stripes,devices /dev/ffzgvg/d501d86b-f421-4811-bcbe-1370da3e3a74.disk0 +#lvs --noheadings '--separator=|' --units=k --nosuffix -olv_attr,lv_kernel_major,lv_kernel_minor,vg_extent_size,stripes,devices /dev/ffzgvg/d501d86b-f421-4811-bcbe-1370da3e3a74.disk0 +# gnt-node volumes +lvs --noheadings --units=m --nosuffix '--separator=|' --options=lv_name,lv_size,devices,vg_name