Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=939d29652579e475…
Commit: 939d29652579e4759d445c87dc21d1a6b37fd97d
Parent: 9a81881965f1c990632c13699f2184cd1680cf39
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Jan 13 15:47:26 2016 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Jan 13 15:47:26 2016 +0100
conf: fix 'the volume list' vs 'volume list' and '@*'
---
conf/example.conf.in | 12 ++++++------
lib/config/config_settings.h | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index e567a73..4dbe289 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1108,8 +1108,8 @@ activation {
# or VG.
# @*
# Selects an LV if a tag defined on the host is also set on the LV
- # or VG. See tags/hosttags. If any host tags exist but the volume
- # list is not defined, a default single-entry list containing '@*'
+ # or VG. See tags/hosttags. If any host tags exist but volume_list
+ # is not defined, a default single-entry list containing '@*'
# is assumed.
#
# Example
@@ -1145,8 +1145,8 @@ activation {
# or VG.
# @*
# Selects an LV if a tag defined on the host is also set on the LV
- # or VG. See tags/hosttags. If any host tags exist but the volume
- # list is not defined, a default single-entry list containing '@*'
+ # or VG. See tags/hosttags. If any host tags exist but volume_list
+ # is not defined, a default single-entry list containing '@*'
# is assumed.
#
# Example
@@ -1171,8 +1171,8 @@ activation {
# or VG.
# @*
# Selects an LV if a tag defined on the host is also set on the LV
- # or VG. See tags/hosttags. If any host tags exist but the volume
- # list is not defined, a default single-entry list containing '@*'
+ # or VG. See tags/hosttags. If any host tags exist but volume_list
+ # is not defined, a default single-entry list containing '@*'
# is assumed.
#
# Example
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 60b5110..dcebe99 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -1066,8 +1066,8 @@ cfg_array(activation_volume_list_CFG, "volume_list", activation_CFG_SECTION, CFG
" or VG.\n"
" @*\n"
" Selects an LV if a tag defined on the host is also set on the LV\n"
- " or VG. See tags/hosttags. If any host tags exist but the volume\n"
- " list is not defined, a default single-entry list containing '@*'\n"
+ " or VG. See tags/hosttags. If any host tags exist but volume_list\n"
+ " is not defined, a default single-entry list containing '@*'\n"
" is assumed.\n"
"#\n"
"Example\n"
@@ -1102,8 +1102,8 @@ cfg_array(activation_auto_activation_volume_list_CFG, "auto_activation_volume_li
" or VG.\n"
" @*\n"
" Selects an LV if a tag defined on the host is also set on the LV\n"
- " or VG. See tags/hosttags. If any host tags exist but the volume\n"
- " list is not defined, a default single-entry list containing '@*'\n"
+ " or VG. See tags/hosttags. If any host tags exist but volume_list\n"
+ " is not defined, a default single-entry list containing '@*'\n"
" is assumed.\n"
"#\n"
"Example\n"
@@ -1127,8 +1127,8 @@ cfg_array(activation_read_only_volume_list_CFG, "read_only_volume_list", activat
" or VG.\n"
" @*\n"
" Selects an LV if a tag defined on the host is also set on the LV\n"
- " or VG. See tags/hosttags. If any host tags exist but the volume\n"
- " list is not defined, a default single-entry list containing '@*'\n"
+ " or VG. See tags/hosttags. If any host tags exist but volume_list\n"
+ " is not defined, a default single-entry list containing '@*'\n"
" is assumed.\n"
"#\n"
"Example\n"
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=efab21b4115d1cc7…
Commit: efab21b4115d1cc79c3b02c64cd15f360176c3cb
Parent: c66a83fdc380f7a4f694481cb3d78d52ce888fa4
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Jan 13 14:17:50 2016 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Jan 13 14:37:09 2016 +0100
test: add report-invisible.sh test
---
test/shell/report-invisible.sh | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/test/shell/report-invisible.sh b/test/shell/report-invisible.sh
new file mode 100644
index 0000000..d906c97
--- /dev/null
+++ b/test/shell/report-invisible.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Copyright (C) 2016 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+SKIP_WITH_LVMETAD=1
+SKIP_WITH_CLVMD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+aux prepare_vg 1
+lvcreate --type mirror -m1 -l1 --alloc anywhere -n $lv1 $vg
+
+aux lvmconf 'log/prefix=""'
+
+aux lvmconf "report/mark_invisible_devices = 0"
+lvs --noheadings -a -o name $vg > out
+grep "^${lv1}_mimage_0" out
+not grep "^\[${lv1}_mimage_0\]" out
+lvs --noheadings -a -o devices $vg/$lv1 > out
+grep "^${lv1}_mimage_0" out
+not grep "^\[${lv1}_mimage_0\]" out
+
+aux lvmconf "report/mark_invisible_devices = 1"
+lvs --noheadings -a -o name $vg > out
+grep "^\[${lv1}_mimage_0\]" out
+not grep "^${lv1}_mimage_0" out
+lvs --noheadings -a -o devices $vg/$lv1 > out
+grep "^\[${lv1}_mimage_0\]" out
+not grep "^${lv1}_mimage_0" out
+
+vgremove -ff $vg
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c66a83fdc380f7a4…
Commit: c66a83fdc380f7a4f694481cb3d78d52ce888fa4
Parent: 84a9f750fe00cd47c4ea5139ed66e0b175b66f00
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Jan 13 13:55:24 2016 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Jan 13 13:55:24 2016 +0100
tests: update tests to deal with invisible devices consistently
---
test/lib/aux.sh | 1 +
test/shell/pvmove-abort.sh | 4 ++--
test/shell/pvmove-resume-1.sh | 20 ++++++++++----------
test/shell/pvmove-resume-2.sh | 10 +++++-----
test/shell/pvmove-resume-multiseg.sh | 18 +++++++++---------
5 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 216dd19..51dba36 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -880,6 +880,7 @@ log/level = 9
log/overwrite = 1
log/syslog = 0
log/verbose = 0
+report/mark_invisible_devices=0
EOF
}
diff --git a/test/shell/pvmove-abort.sh b/test/shell/pvmove-abort.sh
index 336e92a..1fbeb20 100644
--- a/test/shell/pvmove-abort.sh
+++ b/test/shell/pvmove-abort.sh
@@ -51,8 +51,8 @@ pvmove --abort "$dev1"
# check if proper pvmove was canceled
get lv_field $vg name -a | tee out
-not grep "^\[pvmove0\]" out
-grep "^\[pvmove1\]" out
+not grep "^pvmove0" out
+grep "^pvmove1" out
fi
diff --git a/test/shell/pvmove-resume-1.sh b/test/shell/pvmove-resume-1.sh
index f4ba5fa..37f2d24 100644
--- a/test/shell/pvmove-resume-1.sh
+++ b/test/shell/pvmove-resume-1.sh
@@ -88,13 +88,13 @@ test_pvmove_resume() {
aux enable_dev "$dev4"
i=0
- while get lv_field $vg name -a | grep "^\[pvmove"; do
+ while get lv_field $vg name -a | grep "^pvmove"; do
# wait for 30 secs at max
test $i -ge 300 && die "Pvmove is too slow or does not progress."
sleep .1
i=$((i + 1))
done
- while get lv_field $vg1 name -a | grep "^\[pvmove"; do
+ while get lv_field $vg1 name -a | grep "^pvmove"; do
# wait for 30 secs at max
test $i -ge 300 && die "Pvmove is too slow or does not progress."
sleep .1
@@ -170,8 +170,8 @@ pvmove_fg() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg1 name -a | grep "^pvmove0"
# disable delay device
# fg pvmove would take ages to complete otherwise
@@ -195,8 +195,8 @@ pvmove_bg() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg1 name -a | grep "^pvmove0"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b -i0
}
@@ -215,8 +215,8 @@ pvmove_fg_single() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg1 name -a | grep "^pvmove0"
# disable delay device
# fg pvmove would take ages to complete otherwise
@@ -241,8 +241,8 @@ pvmove_bg_single() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg1 name -a | grep "^pvmove0"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev1"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev2"
diff --git a/test/shell/pvmove-resume-2.sh b/test/shell/pvmove-resume-2.sh
index c8643e4..91453e4 100644
--- a/test/shell/pvmove-resume-2.sh
+++ b/test/shell/pvmove-resume-2.sh
@@ -75,7 +75,7 @@ test_pvmove_resume() {
aux enable_dev "$dev2"
i=0
- while get lv_field $vg name -a | grep "^\[pvmove"; do
+ while get lv_field $vg name -a | grep "^pvmove"; do
# wait for 30 secs at max
test $i -ge 300 && die "Pvmove is too slow or does not progress."
sleep .1
@@ -128,7 +128,7 @@ pvmove_fg() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
aux enable_dev "$dev2"
@@ -148,7 +148,7 @@ pvmove_bg() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b
}
@@ -166,7 +166,7 @@ pvmove_fg_single() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
aux enable_dev "$dev2"
@@ -186,7 +186,7 @@ pvmove_bg_single() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
+ get lv_field $vg name -a | grep "^pvmove0"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev1"
}
diff --git a/test/shell/pvmove-resume-multiseg.sh b/test/shell/pvmove-resume-multiseg.sh
index 6982fef..35ee871 100644
--- a/test/shell/pvmove-resume-multiseg.sh
+++ b/test/shell/pvmove-resume-multiseg.sh
@@ -88,7 +88,7 @@ test_pvmove_resume() {
aux enable_dev "$dev5"
i=0
- while get lv_field $vg name -a | grep "^\[pvmove"; do
+ while get lv_field $vg name -a | grep "^pvmove"; do
# wait for 30 secs at max
test $i -ge 300 && die "Pvmove is too slow or does not progress."
sleep .1
@@ -144,8 +144,8 @@ pvmove_fg() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg name -a | grep "^\[pvmove1\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg name -a | grep "^pvmove1"
# disable delay device
# fg pvmove would take ages to complete otherwise
@@ -169,8 +169,8 @@ pvmove_bg() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg name -a | grep "^\[pvmove1\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg name -a | grep "^pvmove1"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b
}
@@ -189,8 +189,8 @@ pvmove_fg_single() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg name -a | grep "^\[pvmove1\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg name -a | grep "^pvmove1"
# disable delay device
# fg pvmove would take ages to complete otherwise
@@ -215,8 +215,8 @@ pvmove_bg_single() {
fi
# ...thus finish polling
- get lv_field $vg name -a | grep "^\[pvmove0\]"
- get lv_field $vg name -a | grep "^\[pvmove1\]"
+ get lv_field $vg name -a | grep "^pvmove0"
+ get lv_field $vg name -a | grep "^pvmove1"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev1"
LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev3"
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=53b355a24b10d50b…
Commit: 53b355a24b10d50b5f330d71afa80a491532b07a
Parent: e168b5de75204a554fcb6f9a3bd25dada2561c86
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Jan 13 11:58:12 2016 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Jan 13 12:01:55 2016 +0100
conf: regenerate
---
conf/example.conf.in | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index b8c0407..f549f15 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1108,9 +1108,9 @@ activation {
# or VG.
# @*
# Selects an LV if a tag defined on the host is also set on the LV
- # or VG. See tags/hosttags. If any host tags exist but volume_list
- # is not defined, a default single-entry list containing '@*' is
- # assumed.
+ # or VG. See tags/hosttags. If any host tags exist but the volume
+ # list is not defined, a default single-entry list containing '@*'
+ # is assumed.
#
# Example
# volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
@@ -1145,12 +1145,12 @@ activation {
# or VG.
# @*
# Selects an LV if a tag defined on the host is also set on the LV
- # or VG. See tags/hosttags. If any host tags exist but volume_list
- # is not defined, a default single-entry list containing '@*' is
- # assumed.
+ # or VG. See tags/hosttags. If any host tags exist but the volume
+ # list is not defined, a default single-entry list containing '@*'
+ # is assumed.
#
# Example
- # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
+ # auto_activation_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
#
# This configuration option does not have a default value defined.
@@ -1171,12 +1171,12 @@ activation {
# or VG.
# @*
# Selects an LV if a tag defined on the host is also set on the LV
- # or VG. See tags/hosttags. If any host tags exist but volume_list
- # is not defined, a default single-entry list containing '@*' is
- # assumed.
+ # or VG. See tags/hosttags. If any host tags exist but the volume
+ # list is not defined, a default single-entry list containing '@*'
+ # is assumed.
#
# Example
- # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
+ # read_only_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
#
# This configuration option does not have a default value defined.
@@ -1808,6 +1808,11 @@ activation {
# See 'pvs --segments -o help' for the list of possible fields.
# This configuration option has an automatic default value.
# pvsegs_cols_verbose = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges"
+
+ # Configuration option report/mark_invisible_devices.
+ # Use brackets [] to mark invisible devices.
+ # This configuration option has an automatic default value.
+ # mark_invisible_devices = 1
# }
# Configuration section dmeventd.