lvm2-commits October 2014

lvm2-commits@lists.fedorahosted.org

5 participants
169 discussions

master - lvchange: Allow appropriate actions on cache (in addition to thin) pools.
by Petr Rockai 13 Oct '14

13 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=22a6b0e40b302b33… Commit: 22a6b0e40b302b333f9bd995c0b81b0146e8232a Parent: b59335fb398062d6537e8d4e815dcbf339343967 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Mon Oct 13 16:21:41 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Mon Oct 13 16:21:41 2014 +0200 lvchange: Allow appropriate actions on cache (in addition to thin) pools. --- test/shell/lvconvert-cache-raid.sh | 4 +++- tools/lvchange.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/shell/lvconvert-cache-raid.sh b/test/shell/lvconvert-cache-raid.sh index 0678846..3ac2d0b 100644 --- a/test/shell/lvconvert-cache-raid.sh +++ b/test/shell/lvconvert-cache-raid.sh @@ -49,6 +49,9 @@ lvcreate -n cpool -m 1 --type raid1 -l 10 $vg lvconvert --yes --type cache-pool --poolmetadata $vg/cpool_meta $vg/cpool lvcreate -n corigin --type cache --cachepool $vg/cpool -l 10 +lvchange --syncaction repair $vg/cpool_cmeta +lvchange --syncaction repair $vg/cpool_cdata + lvconvert --repair -y $vg/cpool_cmeta lvconvert --repair -y $vg/cpool_cdata @@ -60,5 +63,4 @@ not lvconvert --splitmirrors 1 --name split_cdata $vg/cpool_cdata "$dev1" lvconvert --splitmirrors 1 --name split_meta $vg/cpool_cmeta "$dev1" lvconvert --splitmirrors 1 --name split_data $vg/cpool_cdata "$dev1" - vgremove -f $vg diff --git a/tools/lvchange.c b/tools/lvchange.c index 3a0e848..114065c 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -857,7 +857,8 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, lv_is_virtual_origin(origin = origin_from_cow(lv))) lv = origin; - if ((lv_is_thin_pool_data(lv) || lv_is_thin_pool_metadata(lv)) && + if ((lv_is_thin_pool_data(lv) || lv_is_thin_pool_metadata(lv) || + lv_is_cache_pool_data(lv) || lv_is_cache_pool_metadata(lv)) && !arg_count(cmd, activate_ARG) && !arg_count(cmd, permission_ARG) && !arg_count(cmd, setactivationskip_ARG))

1 0

master - toollib: validate_restricted_lvname_param
by Zdenek Kabelac 08 Oct '14

08 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b59335fb398062d6… Commit: b59335fb398062d6537e8d4e815dcbf339343967 Parent: c87e5a308a95e6e7c2d120ce816df14644f8e70a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Oct 8 11:14:33 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Oct 8 11:35:50 2014 +0200 toollib: validate_restricted_lvname_param Lets make a separate new function to validate names that has to follow up restriction rules. --- tools/lvconvert.c | 8 ++++---- tools/lvcreate.c | 5 +---- tools/toollib.c | 19 +++++++++++++++++++ tools/toollib.h | 2 ++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 50410a5..ad4a6c0 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -126,16 +126,16 @@ static int _lvconvert_name_params(struct lvconvert_params *lp, (*pargv)++, (*pargc)--; } - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_metadata_name)) + if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->pool_metadata_name)) return_0; - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_data_name)) + if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->pool_data_name)) return_0; - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin_name)) + if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->origin_name)) return_0; - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->lv_split_name)) + if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->lv_split_name)) return_0; if (strchr(lp->lv_name_full, '/') && diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 41b8ee3..5a4bced 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -51,10 +51,7 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, const char *vg_name; lp->lv_name = arg_str_value(cmd, name_ARG, NULL); - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->lv_name)) - return_0; - - if (lp->lv_name && !apply_lvname_restrictions(lp->lv_name)) + if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->lv_name)) return_0; lp->pool_name = arg_str_value(cmd, thinpool_ARG, NULL) diff --git a/tools/toollib.c b/tools/toollib.c index 8b92968..7f656c6 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1309,6 +1309,25 @@ int validate_lvname_param(struct cmd_context *cmd, const char **vg_name, return 1; } +/* + * Validate lvname parameter + * This name must follow restriction rules on prefixes and suffixes. + * + * If it contains vgname, it is extracted from lvname. + * If there is passed vgname, it is compared whether its the same name. + */ +int validate_restricted_lvname_param(struct cmd_context *cmd, const char **vg_name, + const char **lv_name) +{ + if (!validate_lvname_param(cmd, vg_name, lv_name)) + return_0; + + if (lv_name && *lv_name && !apply_lvname_restrictions(*lv_name)) + return_0; + + return -1; +} + struct vgnameid_list { struct dm_list list; const char *vg_name; diff --git a/tools/toollib.h b/tools/toollib.h index 037b7d7..50cc26c 100644 --- a/tools/toollib.h +++ b/tools/toollib.h @@ -132,6 +132,8 @@ int get_and_validate_major_minor(const struct cmd_context *cmd, int validate_lvname_param(struct cmd_context *cmd, const char **vg_name, const char **lv_name); +int validate_restricted_lvname_param(struct cmd_context *cmd, const char **vg_name, + const char **lv_name); int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv, void *handle __attribute__((unused)));

1 0

master - filter-usable: filter out blocked and suspended devices firmly when scanning for lvmetad
by Peter Rajnoha 08 Oct '14

08 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c87e5a308a95e6e7… Commit: c87e5a308a95e6e7c2d120ce816df14644f8e70a Parent: f3bb1c018f7b6e38f0351a9994760bae7d9f00e3 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed Oct 8 10:57:44 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed Oct 8 11:03:08 2014 +0200 filter-usable: filter out blocked and suspended devices firmly when scanning for lvmetad We can't hang on blocked or suspended devices when the scan is done for lvmetad update - when the device gets unblocked or resumed, there's always CHANGE event generated which will fire the udev rule to run extra pvscan --cache for that device which makes sure that lvmetad is up-to-date. --- lib/filters/filter-usable.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/filters/filter-usable.c b/lib/filters/filter-usable.c index 2a7ef49..a6932b0 100644 --- a/lib/filters/filter-usable.c +++ b/lib/filters/filter-usable.c @@ -36,8 +36,15 @@ static int _passes_usable_filter(struct dev_filter *f, struct device *dev) break; case FILTER_MODE_PRE_LVMETAD: ucp.check_empty = 1; - ucp.check_blocked = 0; - ucp.check_suspended = ignore_suspended_devices(); + /* + * If we're scanning for lvmetad update, + * we don't want to hang on blocked/suspended devices. + * When the device is unblocked/resumed, surely, + * there's going to be a CHANGE event so the device + * gets scanned via udev rule anyway after resume. + */ + ucp.check_blocked = 1; + ucp.check_suspended = 1; ucp.check_error_target = 1; ucp.check_reserved = 1; break;

1 0

master - vgremove: Use process_each_lv_in_vg.
by Alasdair Kergon 07 Oct '14

07 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f3bb1c018f7b6e38… Commit: f3bb1c018f7b6e38f0351a9994760bae7d9f00e3 Parent: d623034e62a5fe0ba541e6d1e543f43ae90a834f Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Oct 7 16:45:45 2014 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Oct 7 16:45:45 2014 +0100 vgremove: Use process_each_lv_in_vg. --- WHATS_NEW | 1 + lib/metadata/metadata-exported.h | 5 ----- lib/metadata/metadata.c | 16 ---------------- tools/lvremove.c | 17 ----------------- tools/toollib.c | 23 ++++++++++++++++++++++- tools/toollib.h | 11 ++++++----- tools/tools.h | 1 + tools/vgdisplay.c | 2 +- tools/vgremove.c | 8 ++++++-- 9 files changed, 37 insertions(+), 47 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index fa4ff65..8511a45 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.112 - ===================================== + Change vgremove to use process_each_lv_in_vg. Introduce WARN_ flags to control some metadata warning messages. Use process_each_pv in vgreduce. Refactor process_each_pv in toollib. diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index ae9996d..0d8db7d 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -661,11 +661,6 @@ int vg_split_mdas(struct cmd_context *cmd, struct volume_group *vg_from, void add_pvl_to_vgs(struct volume_group *vg, struct pv_list *pvl); void del_pvl_from_vgs(struct volume_group *vg, struct pv_list *pvl); -/* FIXME: refactor / unexport when lvremove liblvm refactoring dones */ -int remove_lvs_in_vg(struct cmd_context *cmd, - struct volume_group *vg, - force_t force); - /* * free_pv_fid() must be called on every struct physical_volume allocated * by pv_create, pv_read, find_pv_by_name or to free it when no longer required. diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 5c154bd..9308cb7 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -518,22 +518,6 @@ int vg_rename(struct cmd_context *cmd, struct volume_group *vg, return 1; } -int remove_lvs_in_vg(struct cmd_context *cmd, - struct volume_group *vg, - force_t force) -{ - struct dm_list *lst; - struct lv_list *lvl; - - while ((lst = dm_list_first(&vg->lvs))) { - lvl = dm_list_item(lst, struct lv_list); - if (!lv_remove_with_dependencies(cmd, lvl->lv, force, 0)) - return_0; - } - - return 1; -} - int vg_remove_check(struct volume_group *vg) { unsigned lv_count; diff --git a/tools/lvremove.c b/tools/lvremove.c index 7d2fec1..1005218 100644 --- a/tools/lvremove.c +++ b/tools/lvremove.c @@ -15,23 +15,6 @@ #include "tools.h" -static int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv, - void *handle __attribute__((unused))) -{ - /* - * Single force is equivalent to sinle --yes - * Even multiple --yes are equivalent to single --force - * When we require -ff it cannot be replaces with -f -y - */ - force_t force = (force_t) arg_count(cmd, force_ARG) - ? : (arg_is_set(cmd, yes_ARG) ? DONT_PROMPT : PROMPT); - - if (!lv_remove_with_dependencies(cmd, lv, force, 0)) - return_ECMD_FAILED; - - return ECMD_PROCESSED; -} - int lvremove(struct cmd_context *cmd, int argc, char **argv) { if (!argc) { diff --git a/tools/toollib.c b/tools/toollib.c index 3b1b00f..8b92968 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1569,6 +1569,7 @@ int process_each_vg(struct cmd_context *cmd, int argc, char **argv, int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg, struct dm_list *arg_lvnames, const struct dm_list *tags_in, + int stop_on_error, void *handle, process_single_lv_fn_t process_single_lv) { int ret_max = ECMD_PROCESSED; @@ -1640,6 +1641,9 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg, if (ret > ret_max) ret_max = ret; + + if (stop_on_error && ret != ECMD_PROCESSED) + return ret_max; } if (lvargs_supplied) { @@ -1826,7 +1830,7 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t flags, continue; } - ret = process_each_lv_in_vg(cmd, vg, &lvnames, tags_arg, + ret = process_each_lv_in_vg(cmd, vg, &lvnames, tags_arg, 0, handle, process_single_lv); unlock_and_release_vg(cmd, vg, vg_name); @@ -2254,3 +2258,20 @@ int process_each_pv_in_vg(struct cmd_context *cmd, struct volume_group *vg, return ret_max; } + +int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv, + void *handle __attribute__((unused))) +{ + /* + * Single force is equivalent to single --yes + * Even multiple --yes are equivalent to single --force + * When we require -ff it cannot be replaced with -f -y + */ + force_t force = (force_t) arg_count(cmd, force_ARG) + ? : (arg_is_set(cmd, yes_ARG) ? DONT_PROMPT : PROMPT); + + if (!lv_remove_with_dependencies(cmd, lv, force, 0)) + return_ECMD_FAILED; + + return ECMD_PROCESSED; +} diff --git a/tools/toollib.h b/tools/toollib.h index 5b42f28..037b7d7 100644 --- a/tools/toollib.h +++ b/tools/toollib.h @@ -74,11 +74,9 @@ int process_each_pv_in_vg(struct cmd_context *cmd, struct volume_group *vg, void *handle, process_single_pv_fn_t process_single_pv); -int process_each_lv_in_vg(struct cmd_context *cmd, - struct volume_group *vg, - struct dm_list *arg_lvnames, - const struct dm_list *tagsl, - void *handle, +int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg, + struct dm_list *arg_lvnames, const struct dm_list *tagsl, + int stop_on_error, void *handle, process_single_lv_fn_t process_single_lv); const char *extract_vgname(struct cmd_context *cmd, const char *lv_name); @@ -135,4 +133,7 @@ int get_and_validate_major_minor(const struct cmd_context *cmd, int validate_lvname_param(struct cmd_context *cmd, const char **vg_name, const char **lv_name); +int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv, + void *handle __attribute__((unused))); + #endif diff --git a/tools/tools.h b/tools/tools.h index 134e584..5fa1ab6 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -177,4 +177,5 @@ int mirror_remove_missing(struct cmd_context *cmd, int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg, activation_change_t activate); + #endif diff --git a/tools/vgdisplay.c b/tools/vgdisplay.c index 95a5ebd..6e068aa 100644 --- a/tools/vgdisplay.c +++ b/tools/vgdisplay.c @@ -39,7 +39,7 @@ static int vgdisplay_single(struct cmd_context *cmd, const char *vg_name, if (arg_count(cmd, verbose_ARG)) { vgdisplay_extents(vg); - process_each_lv_in_vg(cmd, vg, NULL, NULL, NULL, + process_each_lv_in_vg(cmd, vg, NULL, NULL, 0, NULL, (process_single_lv_fn_t)lvdisplay_full); log_print("--- Physical volumes ---"); diff --git a/tools/vgremove.c b/tools/vgremove.c index 0bbca76..1dce41f 100644 --- a/tools/vgremove.c +++ b/tools/vgremove.c @@ -27,6 +27,7 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name, force_t force = (force_t) arg_count(cmd, force_ARG) ? : (arg_is_set(cmd, yes_ARG) ? DONT_PROMPT : PROMPT); unsigned lv_count, missing; + int ret; if (!vg_check_status(vg, EXPORTED_VG)) return_ECMD_FAILED; @@ -46,8 +47,11 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name, return ECMD_FAILED; } } - if (!remove_lvs_in_vg(cmd, vg, force)) - return_ECMD_FAILED; + if ((ret = process_each_lv_in_vg(cmd, vg, NULL, NULL, 1, NULL, + (process_single_lv_fn_t)lvremove_single)) != ECMD_PROCESSED) { + stack; + return ret; + } } if (!force && !vg_remove_check(vg))

1 0

master - test: Fix lvconvert-raid-allocation's use of lvconvert --repair.
by Petr Rockai 07 Oct '14

07 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d623034e62a5fe0b… Commit: d623034e62a5fe0ba541e6d1e543f43ae90a834f Parent: 88959032f7efb9229632c74a3738aae171f0c460 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Tue Oct 7 16:09:43 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Tue Oct 7 16:12:04 2014 +0200 test: Fix lvconvert-raid-allocation's use of lvconvert --repair. --- test/shell/lvconvert-raid-allocation.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-raid-allocation.sh b/test/shell/lvconvert-raid-allocation.sh index bd2cab5..a1b1c39 100644 --- a/test/shell/lvconvert-raid-allocation.sh +++ b/test/shell/lvconvert-raid-allocation.sh @@ -63,7 +63,7 @@ lvcreate --type raid1 -m 1 -l 3 -n $lv1 $vg \ "$dev1:0-1" "$dev2:0-1" "$dev3:0-1" "$dev4:0-1" aux wait_for_sync $vg $lv1 aux disable_dev "$dev1" -lvconvert --repair -y $vg/$lv1 "$dev1" "$dev2" "$dev3" "$dev4" +lvconvert --repair -y $vg/$lv1 "$dev2" "$dev3" "$dev4" #FIXME: ensure non-overlapping images (they should not share PVs) aux enable_dev "$dev1" lvremove -ff $vg

1 0

master - metadata: Fix find_pv_in_vg for missing PVs/filtered devices.
by Petr Rockai 07 Oct '14

07 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=88959032f7efb922… Commit: 88959032f7efb9229632c74a3738aae171f0c460 Parent: 0cbb381e159f0606ec749697a596d2a6cc814283 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Tue Oct 7 16:06:21 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Tue Oct 7 16:11:56 2014 +0200 metadata: Fix find_pv_in_vg for missing PVs/filtered devices. --- lib/metadata/metadata.c | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 3e5bd5d..5c154bd 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1778,31 +1778,20 @@ struct pv_list *find_pv_in_vg(const struct volume_group *vg, const char *pv_name) { struct pv_list *pvl; + struct device *dev = dev_cache_get(pv_name, vg->cmd->filter); - dm_list_iterate_items(pvl, &vg->pvs) { - if (!pvl->pv->dev) { - /* - * pv_dev can't be NULL here! - * We have to catch this situation earlier in the - * code if this internal error is hit. Otherwise, - * there's a possibility that pv_dev will match - * cached_dev in case both are NULL. - * - * NULL cached_dev may happen in case this device - * is filtered and NULL pv_dev may happen if the - * device is missing! - * - * If such incorrect match was hit, simply incorrect - * PV would be processed. This really needs to be - * handled earlier in the code in that case. - */ - log_error(INTERNAL_ERROR "find_pv_in_vg: PV that is not " - "bound to any existing device found."); - return NULL; - } - if (pvl->pv->dev == dev_cache_get(pv_name, vg->cmd->filter)) + /* + * If the device does not exist or is filtered out, don't bother trying + * to find it in the list. This also prevents accidentally finding a + * non-NULL PV which happens to be missing (i.e. its pv->dev is NULL) + * for such devices. + */ + if (!dev) + return NULL; + + dm_list_iterate_items(pvl, &vg->pvs) + if (pvl->pv->dev == dev) return pvl; - } return NULL; }

1 0

master - lvcreate: regression fix on lv name limits
by Zdenek Kabelac 07 Oct '14

07 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0cbb381e159f0606… Commit: 0cbb381e159f0606ec749697a596d2a6cc814283 Parent: 27ff61d012740dcdb8f5cf6421c22f746d056fe1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Oct 7 15:41:54 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Oct 7 15:52:31 2014 +0200 lvcreate: regression fix on lv name limits When we are given an existing LV name - it needs to be allowed to pass in even restricted name as the LV could have existed long before we introduced some new restriction on prefix/suffix.i Fix the regression on name limits and drop restriction to be applied on any existing LVs - only the new created LV names have to be complient with current name restrictions. FIXME: we are currently using restricted names incorrectly in few other places - device_is_usable() skips restricted names, and udev flags are also incorrectly set for restricted names so these LVs are not getting links properly. --- lib/metadata/lv_manip.c | 6 ++++++ tools/lvcreate.c | 3 +++ tools/toollib.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 892f7ca..f14cec0 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -7172,6 +7172,9 @@ struct logical_volume *lv_create_single(struct volume_group *vg, !(lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool"))) return_NULL; + if (lp->pool_name && !apply_lvname_restrictions(lp->pool_name)) + return_NULL; + if (!(lv = _lv_create_an_lv(vg, lp, lp->pool_name))) return_NULL; @@ -7188,6 +7191,9 @@ struct logical_volume *lv_create_single(struct volume_group *vg, "cache-pool"))) return_NULL; + if (lp->pool_name && !apply_lvname_restrictions(lp->pool_name)) + return_NULL; + if (!(lv = _lv_create_an_lv(vg, lp, lp->pool_name))) return_NULL; diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 2fa7918..41b8ee3 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -54,6 +54,9 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, if (!validate_lvname_param(cmd, &lp->vg_name, &lp->lv_name)) return_0; + if (lp->lv_name && !apply_lvname_restrictions(lp->lv_name)) + return_0; + lp->pool_name = arg_str_value(cmd, thinpool_ARG, NULL) ? : arg_str_value(cmd, cachepool_ARG, NULL); if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_name)) diff --git a/tools/toollib.c b/tools/toollib.c index 1ee8469..3b1b00f 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1300,9 +1300,6 @@ int validate_lvname_param(struct cmd_context *cmd, const char **vg_name, *lv_name = lvname; } - if (!apply_lvname_restrictions(*lv_name)) - return_0; - if (!validate_name(*lv_name)) { log_error("Logical volume name \"%s\" is invalid.", *lv_name);

1 0

master - cleanup: rename _name, _lv and _size
by Zdenek Kabelac 07 Oct '14

07 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=27ff61d012740dcd… Commit: 27ff61d012740dcdb8f5cf6421c22f746d056fe1 Parent: 62802ddae052e9af996a4366bdcd5a9f2ec713d1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Oct 7 10:43:47 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Oct 7 15:51:53 2014 +0200 cleanup: rename _name, _lv and _size Use some standard names for lv char * names, logical_volume * lv and sizes internally. --- lib/metadata/lv_manip.c | 120 +++++++++++++++++----------------- lib/metadata/metadata-exported.h | 10 ++-- liblvm/lvm_lv.c | 32 +++++----- tools/lvconvert.c | 52 +++++++------- tools/lvcreate.c | 134 +++++++++++++++++++------------------- 5 files changed, 174 insertions(+), 174 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 0aa6521..892f7ca 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6555,7 +6555,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, struct cmd_context *cmd = vg->cmd; uint32_t size_rest; uint64_t status = UINT64_C(0); - struct logical_volume *lv, *org = NULL; + struct logical_volume *lv, *origin_lv = NULL; struct logical_volume *pool_lv; struct logical_volume *tmp_lv; const char *thin_name = NULL; @@ -6639,14 +6639,14 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, status |= lp->permission | VISIBLE_LV; if (seg_is_cache(lp)) { - if (!lp->pool) { + if (!lp->pool_name) { log_error(INTERNAL_ERROR "Cannot create cached volume without cache pool."); return NULL; } /* We have the cache_pool, create the origin with cache */ - if (!(pool_lv = find_lv(vg, lp->pool))) { + if (!(pool_lv = find_lv(vg, lp->pool_name))) { log_error("Couldn't find cache pool volume %s in " - "volume group %s.", lp->pool, vg->name); + "volume group %s.", lp->pool_name, vg->name); return NULL; } @@ -6663,22 +6663,22 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (!(lp->segtype = get_segtype_from_string(vg->cmd, "striped"))) return_0; } else if (seg_is_thin(lp) && lp->snapshot) { - if (!lp->origin) { + if (!lp->origin_name) { log_error(INTERNAL_ERROR "Origin LV is not defined."); return 0; } - if (!(org = find_lv(vg, lp->origin))) { + if (!(origin_lv = find_lv(vg, lp->origin_name))) { log_error("Couldn't find origin volume '%s'.", - lp->origin); + lp->origin_name); return NULL; } - if (lv_is_locked(org)) { + if (lv_is_locked(origin_lv)) { log_error("Snapshots of locked devices are not supported."); return NULL; } - lp->voriginextents = org->le_count; + lp->voriginextents = origin_lv->le_count; } else if (lp->snapshot) { if (!activation()) { log_error("Can't create snapshot without using " @@ -6691,51 +6691,51 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (!lp->voriginsize) { - if (!(org = find_lv(vg, lp->origin))) { + if (!(origin_lv = find_lv(vg, lp->origin_name))) { log_error("Couldn't find origin volume '%s'.", - lp->origin); + lp->origin_name); return NULL; } - if (lv_is_virtual_origin(org)) { + if (lv_is_virtual_origin(origin_lv)) { log_error("Can't share virtual origins. " "Use --virtualsize."); return NULL; } - if (lv_is_cow(org)) { + if (lv_is_cow(origin_lv)) { log_error("Snapshots of snapshots are not " "supported yet."); return NULL; } - if (lv_is_locked(org)) { + if (lv_is_locked(origin_lv)) { log_error("Snapshots of locked devices are not " "supported yet"); return NULL; } - if (lv_is_merging_origin(org)) { + if (lv_is_merging_origin(origin_lv)) { log_error("Snapshots of an origin that has a " "merging snapshot is not supported"); return NULL; } - if (lv_is_thin_type(org) && !lv_is_thin_volume(org)) { + if (lv_is_thin_type(origin_lv) && !lv_is_thin_volume(origin_lv)) { log_error("Snapshots of thin pool %sdevices " "are not supported.", - lv_is_thin_pool_data(org) ? "data " : - lv_is_thin_pool_metadata(org) ? + lv_is_thin_pool_data(origin_lv) ? "data " : + lv_is_thin_pool_metadata(origin_lv) ? "metadata " : ""); return NULL; } - if (lv_is_mirror_type(org)) { + if (lv_is_mirror_type(origin_lv)) { log_warn("WARNING: Snapshots of mirrors can deadlock under rare device failures."); log_warn("WARNING: Consider using the raid1 mirror type to avoid this."); log_warn("WARNING: See global/mirror_segtype_default in lvm.conf."); } - if (vg_is_clustered(vg) && lv_is_active(org) && - !lv_is_active_exclusive_locally(org)) { + if (vg_is_clustered(vg) && lv_is_active(origin_lv) && + !lv_is_active_exclusive_locally(origin_lv)) { log_error("%s must be active exclusively to" - " create snapshot", org->name); + " create snapshot", origin_lv->name); return NULL; } } @@ -6807,14 +6807,14 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (seg_is_thin_volume(lp)) { /* Ensure all stacked messages are submitted */ - if (!lp->pool) { + if (!lp->pool_name) { log_error(INTERNAL_ERROR "Undefined pool for thin volume segment."); return NULL; } - if (!(pool_lv = find_lv(vg, lp->pool))) { + if (!(pool_lv = find_lv(vg, lp->pool_name))) { log_error("Unable to find existing pool LV %s in VG %s.", - lp->pool, vg->name); + lp->pool_name, vg->name); return NULL; } @@ -6823,11 +6823,11 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, return_NULL; /* For thin snapshot we must have matching pool */ - if (org && lv_is_thin_volume(org) && (!lp->pool || - (strcmp(first_seg(org)->pool_lv->name, lp->pool) == 0))) - thin_name = org->name; + if (origin_lv && lv_is_thin_volume(origin_lv) && (!lp->pool_name || + (strcmp(first_seg(origin_lv)->pool_lv->name, lp->pool_name) == 0))) + thin_name = origin_lv->name; else - thin_name = lp->pool; + thin_name = lp->pool_name; } if (segtype_is_mirrored(lp->segtype) || segtype_is_raid(lp->segtype)) { @@ -6867,7 +6867,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (!lv_extend(lv, lp->segtype, lp->stripes, lp->stripe_size, lp->mirrors, - seg_is_pool(lp) ? lp->poolmetadataextents : lp->region_size, + seg_is_pool(lp) ? lp->pool_metadata_extents : lp->region_size, seg_is_thin_volume(lp) ? lp->voriginextents : lp->extents, thin_name, lp->pvh, lp->alloc, lp->approx_alloc)) return_NULL; @@ -6900,18 +6900,18 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, * Check if using 'external origin' or the 'normal' snapshot * within the same thin pool */ - if (lp->snapshot && (first_seg(org)->pool_lv != pool_lv)) { - if (!pool_supports_external_origin(first_seg(pool_lv), org)) + if (lp->snapshot && (first_seg(origin_lv)->pool_lv != pool_lv)) { + if (!pool_supports_external_origin(first_seg(pool_lv), origin_lv)) return_0; - if (org->status & LVM_WRITE) { + if (origin_lv->status & LVM_WRITE) { log_error("Cannot use writable LV as the external origin."); return 0; // TODO conversion for inactive } - if (lv_is_active(org) && !lv_is_external_origin(org)) { + if (lv_is_active(origin_lv) && !lv_is_external_origin(origin_lv)) { log_error("Cannot use active LV for the external origin."); return 0; // We can't be sure device is read-only } - if (!attach_thin_external_origin(first_seg(lv), org)) + if (!attach_thin_external_origin(first_seg(lv), origin_lv)) return_NULL; } @@ -6953,18 +6953,18 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, * Either we have origin or pool and created cache origin LV */ if (lp->cache && - (lp->origin || (lp->pool && !lv_is_cache_pool(lv)))) { - if (lp->origin) { - if (!(org = find_lv(vg, lp->origin))) + (lp->origin_name || (lp->pool_name && !lv_is_cache_pool(lv)))) { + if (lp->origin_name) { + if (!(origin_lv = find_lv(vg, lp->origin_name))) goto deactivate_and_revert_new_lv; pool_lv = lv; /* Cache pool is created */ - } else if (lp->pool) { - if (!(pool_lv = find_lv(vg, lp->pool))) + } else if (lp->pool_name) { + if (!(pool_lv = find_lv(vg, lp->pool_name))) goto deactivate_and_revert_new_lv; - org = lv; /* Cached origin is created */ + origin_lv = lv; /* Cached origin is created */ } - if (!(tmp_lv = lv_cache_create(pool_lv, org))) + if (!(tmp_lv = lv_cache_create(pool_lv, origin_lv))) goto deactivate_and_revert_new_lv; /* From here we cannot deactive_and_revert! */ @@ -6976,7 +6976,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, * There is no such problem with cache pool * since it cannot be activated. */ - if (lp->origin && lv_is_active(lv)) { + if (lp->origin_name && lv_is_active(lv)) { if (!is_change_activating(lp->activate)) { /* User requested to create inactive cached volume */ if (deactivate_lv(cmd, lv)) { @@ -7023,19 +7023,19 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (lv_is_thin_volume(lv)) { /* For snapshot, suspend active thin origin first */ - if (org && lv_is_active(org) && lv_is_thin_volume(org)) { - if (!suspend_lv_origin(cmd, org)) { + if (origin_lv && lv_is_active(origin_lv) && lv_is_thin_volume(origin_lv)) { + if (!suspend_lv_origin(cmd, origin_lv)) { log_error("Failed to suspend thin snapshot origin %s/%s.", - org->vg->name, org->name); + origin_lv->vg->name, origin_lv->name); goto revert_new_lv; } - if (!resume_lv_origin(cmd, org)) { /* deptree updates thin-pool */ + if (!resume_lv_origin(cmd, origin_lv)) { /* deptree updates thin-pool */ log_error("Failed to resume thin snapshot origin %s/%s.", - org->vg->name, org->name); + origin_lv->vg->name, origin_lv->name); goto revert_new_lv; } /* At this point remove pool messages, snapshot is active */ - if (!update_pool_lv(first_seg(org)->pool_lv, 0)) { + if (!update_pool_lv(first_seg(origin_lv)->pool_lv, 0)) { stack; goto revert_new_lv; } @@ -7104,7 +7104,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, * if origin is real (not virtual) inactive device. */ if ((vg_is_clustered(vg) || - (!lp->voriginsize && !lv_is_active(org))) && + (!lp->voriginsize && !lv_is_active(origin_lv))) && !deactivate_lv(cmd, lv)) { log_error("Aborting. Couldn't deactivate snapshot " "COW area. Manual intervention required."); @@ -7113,13 +7113,13 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, /* A virtual origin must be activated explicitly. */ if (lp->voriginsize && - (!(org = _create_virtual_origin(cmd, vg, lv->name, + (!(origin_lv = _create_virtual_origin(cmd, vg, lv->name, lp->permission, lp->voriginextents)) || - !activate_lv_excl(cmd, org))) { + !activate_lv_excl(cmd, origin_lv))) { log_error("Couldn't create virtual origin for LV %s", lv->name); - if (org && !lv_remove(org)) + if (origin_lv && !lv_remove(origin_lv)) stack; goto deactivate_and_revert_new_lv; } @@ -7128,14 +7128,14 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, * COW LV is activated via implicit activation of origin LV * Only the snapshot origin holds the LV lock in cluster */ - if (!vg_add_snapshot(org, lv, NULL, - org->le_count, lp->chunk_size)) { + if (!vg_add_snapshot(origin_lv, lv, NULL, + origin_lv->le_count, lp->chunk_size)) { log_error("Couldn't create snapshot."); goto deactivate_and_revert_new_lv; } /* store vg on disk(s) */ - if (!lv_update_and_reload(org)) + if (!lv_update_and_reload(origin_lv)) return_0; } @@ -7172,13 +7172,13 @@ struct logical_volume *lv_create_single(struct volume_group *vg, !(lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool"))) return_NULL; - if (!(lv = _lv_create_an_lv(vg, lp, lp->pool))) + if (!(lv = _lv_create_an_lv(vg, lp, lp->pool_name))) return_NULL; if (!lp->thin && !lp->snapshot) goto out; - lp->pool = lv->name; + lp->pool_name = lv->name; if (!(lp->segtype = get_segtype_from_string(vg->cmd, "thin"))) return_NULL; @@ -7188,7 +7188,7 @@ struct logical_volume *lv_create_single(struct volume_group *vg, "cache-pool"))) return_NULL; - if (!(lv = _lv_create_an_lv(vg, lp, lp->pool))) + if (!(lv = _lv_create_an_lv(vg, lp, lp->pool_name))) return_NULL; if (lv_is_cache(lv)) { @@ -7201,7 +7201,7 @@ struct logical_volume *lv_create_single(struct volume_group *vg, if (!lp->cache) goto out; - lp->pool = lv->name; + lp->pool_name = lv->name; log_error("Creation of cache pool and cached volume in one command is not yet supported."); return NULL; } diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 4ab7672..ae9996d 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -811,7 +811,7 @@ struct lvcreate_params { int32_t minor; /* all */ int log_count; /* mirror */ int nosync; /* mirror */ - int poolmetadataspare; /* thin pool */ + int pool_metadata_spare; /* pools */ int temporary; /* temporary LV */ #define ACTIVATION_SKIP_SET 0x01 /* request to set LV activation skip flag state */ #define ACTIVATION_SKIP_SET_ENABLED 0x02 /* set the LV activation skip flag state to 'enabled' */ @@ -823,10 +823,10 @@ struct lvcreate_params { #define THIN_CHUNK_SIZE_CALC_METHOD_PERFORMANCE 0x02 int thin_chunk_size_calc_policy; - const char *origin; /* snap */ - const char *pool; /* thin */ const char *vg_name; /* only-used when VG is not yet opened (in /tools) */ const char *lv_name; /* all */ + const char *origin_name; /* snap */ + const char *pool_name; /* thin */ /* Keep args given by the user on command line */ /* FIXME: create some more universal solution here */ @@ -855,8 +855,8 @@ struct lvcreate_params { uint32_t extents; /* all */ uint32_t voriginextents; /* snapshot */ uint64_t voriginsize; /* snapshot */ - uint32_t poolmetadataextents; /* thin pool */ - uint64_t poolmetadatasize; /* thin pool */ + uint32_t pool_metadata_extents; /* pools */ + uint64_t pool_metadata_size; /* pools */ struct dm_list *pvh; /* all */ uint32_t permission; /* all */ diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c index 3af1f62..76a3164 100644 --- a/liblvm/lvm_lv.c +++ b/liblvm/lvm_lv.c @@ -496,35 +496,35 @@ lv_t lvm_lv_snapshot(const lv_t lv, const char *snap_name, /* Set defaults for thin pool specific LV parameters */ static int _lv_set_pool_params(struct lvcreate_params *lp, - vg_t vg, const char *pool, + vg_t vg, const char *pool_name, uint64_t extents, uint64_t meta_size) { _lv_set_default_params(lp, vg, NULL, extents); - lp->pool = pool; + lp->pool_name = pool_name; lp->create_pool = 1; lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool"); lp->stripes = 1; if (!meta_size) { - lp->poolmetadatasize = extents * vg->extent_size / + lp->pool_metadata_size = extents * vg->extent_size / (lp->chunk_size * (SECTOR_SIZE / 64)); - while ((lp->poolmetadatasize > + while ((lp->pool_metadata_size > (2 * DEFAULT_THIN_POOL_OPTIMAL_SIZE / SECTOR_SIZE)) && lp->chunk_size < DM_THIN_MAX_DATA_BLOCK_SIZE) { lp->chunk_size <<= 1; - lp->poolmetadatasize >>= 1; + lp->pool_metadata_size >>= 1; } } else - lp->poolmetadatasize = meta_size; + lp->pool_metadata_size = meta_size; - if (lp->poolmetadatasize % vg->extent_size) - lp->poolmetadatasize += - vg->extent_size - lp->poolmetadatasize % vg->extent_size; + if (lp->pool_metadata_size % vg->extent_size) + lp->pool_metadata_size += + vg->extent_size - lp->pool_metadata_size % vg->extent_size; - if (!(lp->poolmetadataextents = - extents_from_size(vg->cmd, lp->poolmetadatasize / SECTOR_SIZE, + if (!(lp->pool_metadata_extents = + extents_from_size(vg->cmd, lp->pool_metadata_size / SECTOR_SIZE, vg->extent_size))) return_0; @@ -605,14 +605,14 @@ lv_create_params_t lvm_lv_params_create_thin_pool(vg_t vg, /* Set defaults for thin LV specific parameters */ static int _lv_set_thin_params(struct lvcreate_params *lp, - vg_t vg, const char *pool, + vg_t vg, const char *pool_name, const char *lvname, uint64_t extents) { _lv_set_default_params(lp, vg, lvname, extents); lp->thin = 1; - lp->pool = pool; + lp->pool_name = pool_name; lp->segtype = get_segtype_from_string(vg->cmd, "thin"); lp->voriginsize = extents * vg->extent_size; @@ -674,11 +674,11 @@ static lv_create_params_t _lvm_lv_params_create_snapshot(const lv_t lv, return NULL; } - lvcp->lvp.pool = first_seg(lv)->pool_lv->name; + lvcp->lvp.pool_name = first_seg(lv)->pool_lv->name; } lvcp->lvp.stripes = 1; - lvcp->lvp.origin = lv->name; + lvcp->lvp.origin_name = lv->name; lvcp->magic = LV_CREATE_PARAMS_MAGIC; } @@ -797,7 +797,7 @@ static lv_t _lvm_lv_create(lv_create_params_t params) * pool is. */ if (!(lvl = find_lv_in_vg(params->vg, - (params->lvp.lv_name) ? params->lvp.lv_name : params->lvp.pool))) + (params->lvp.lv_name) ? params->lvp.lv_name : params->lvp.pool_name))) return_NULL; return (lv_t) lvl->lv; } diff --git a/tools/lvconvert.c b/tools/lvconvert.c index fc22823..50410a5 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -67,10 +67,10 @@ struct lvconvert_params { int passed_args; uint64_t pool_metadata_size; - const char *origin_lv_name; - const char *pool_data_lv_name; + const char *origin_name; + const char *pool_data_name; struct logical_volume *pool_data_lv; - const char *pool_metadata_lv_name; + const char *pool_metadata_name; struct logical_volume *pool_metadata_lv; thin_discards_t discards; }; @@ -126,13 +126,13 @@ static int _lvconvert_name_params(struct lvconvert_params *lp, (*pargv)++, (*pargc)--; } - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_metadata_lv_name)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_metadata_name)) return_0; - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_data_lv_name)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_data_name)) return_0; - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin_lv_name)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin_name)) return_0; if (!validate_lvname_param(cmd, &lp->vg_name, &lp->lv_split_name)) @@ -188,7 +188,7 @@ static int _lvconvert_name_params(struct lvconvert_params *lp, log_error("Too many arguments provided with --uncache."); return 0; } - if (lp->pool_data_lv_name && lp->pool_metadata_lv_name) { + if (lp->pool_data_name && lp->pool_metadata_name) { log_error("Too many arguments provided for pool."); return 0; } @@ -236,7 +236,7 @@ static int _read_pool_params(struct lvconvert_params *lp, struct cmd_context *cm int cachepool = 0; int thinpool = 0; - if ((lp->pool_data_lv_name = arg_str_value(cmd, cachepool_ARG, NULL))) { + if ((lp->pool_data_name = arg_str_value(cmd, cachepool_ARG, NULL))) { if (type_str[0] && strcmp(type_str, "cache") && strcmp(type_str, "cache-pool")) { @@ -248,7 +248,7 @@ static int _read_pool_params(struct lvconvert_params *lp, struct cmd_context *cm type_str = "cache-pool"; } else if (!strcmp(type_str, "cache-pool")) cachepool = 1; - else if ((lp->pool_data_lv_name = arg_str_value(cmd, thinpool_ARG, NULL))) { + else if ((lp->pool_data_name = arg_str_value(cmd, thinpool_ARG, NULL))) { if (type_str[0] && strcmp(type_str, "thin") && strcmp(type_str, "thin-pool")) { @@ -280,7 +280,7 @@ static int _read_pool_params(struct lvconvert_params *lp, struct cmd_context *cm if (thinpool) { lp->discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, THIN_DISCARDS_PASSDOWN); - lp->origin_lv_name = arg_str_value(cmd, originname_ARG, NULL); + lp->origin_name = arg_str_value(cmd, originname_ARG, NULL); } else { if (arg_from_list_is_set(cmd, "is valid only with thin pools", discards_ARG, originname_ARG, thinpool_ARG, @@ -308,23 +308,23 @@ static int _read_pool_params(struct lvconvert_params *lp, struct cmd_context *cm &lp->zero)) return_0; - if ((lp->pool_metadata_lv_name = arg_str_value(cmd, poolmetadata_ARG, NULL)) && + if ((lp->pool_metadata_name = arg_str_value(cmd, poolmetadata_ARG, NULL)) && arg_from_list_is_set(cmd, "is invalid with --poolmetadata", stripesize_ARG, stripes_long_ARG, readahead_ARG, -1)) return_0; - if (!lp->pool_data_lv_name) { + if (!lp->pool_data_name) { if (!*pargc) { log_error("Please specify the pool data LV."); return 0; } - lp->pool_data_lv_name = (*pargv)[0]; + lp->pool_data_name = (*pargv)[0]; (*pargv)++, (*pargc)--; } if (!lp->thin && !lp->cache) - lp->lv_name_full = lp->pool_data_lv_name; + lp->lv_name_full = lp->pool_data_name; /* Hmm _read_activation_params */ lp->read_ahead = arg_uint_value(cmd, readahead_ARG, @@ -528,7 +528,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd, log_error("Please provide logical volume path for snapshot origin."); return 0; } - lp->origin_lv_name = argv[0]; + lp->origin_name = argv[0]; argv++, argc--; if (arg_count(cmd, regionsize_ARG)) { @@ -2164,9 +2164,9 @@ static int _lvconvert_snapshot(struct cmd_context *cmd, return 0; } - if (!(org = find_lv(lv->vg, lp->origin_lv_name))) { + if (!(org = find_lv(lv->vg, lp->origin_name))) { log_error("Couldn't find origin volume %s in Volume group %s.", - lp->origin_lv_name, lv->vg->name); + lp->origin_name, lv->vg->name); return 0; } @@ -2648,11 +2648,11 @@ static int _lvconvert_thin(struct cmd_context *cmd, struct lvcreate_params lvc = { .activate = CHANGE_AEY, .alloc = ALLOC_INHERIT, - .lv_name = lp->origin_lv_name, + .lv_name = lp->origin_name, .major = -1, .minor = -1, .permission = LVM_READ, - .pool = pool_lv->name, + .pool_name = pool_lv->name, .pvh = &vg->pvs, .read_ahead = DM_READ_AHEAD_AUTO, .stripes = 1, @@ -2792,9 +2792,9 @@ static int _lvconvert_pool(struct cmd_context *cmd, char metadata_name[NAME_LEN], data_name[NAME_LEN]; int activate_pool; - if (lp->pool_data_lv_name && - !(pool_lv = find_lv(vg, lp->pool_data_lv_name))) { - log_error("Unknown pool data LV %s.", lp->pool_data_lv_name); + if (lp->pool_data_name && + !(pool_lv = find_lv(vg, lp->pool_data_name))) { + log_error("Unknown pool data LV %s.", lp->pool_data_name); return 0; } @@ -2845,9 +2845,9 @@ static int _lvconvert_pool(struct cmd_context *cmd, return 0; } - if (lp->pool_metadata_lv_name) { - if (!(lp->pool_metadata_lv = find_lv(vg, lp->pool_metadata_lv_name))) { - log_error("Unknown pool metadata LV %s.", lp->pool_metadata_lv_name); + if (lp->pool_metadata_name) { + if (!(lp->pool_metadata_lv = find_lv(vg, lp->pool_metadata_name))) { + log_error("Unknown pool metadata LV %s.", lp->pool_metadata_name); return 0; } lp->pool_metadata_size = lp->pool_metadata_lv->size; @@ -3127,7 +3127,7 @@ mda_write: /* Rename deactivated metadata LV to have _tmeta suffix */ /* Implicit checks if metadata_lv is visible */ - if (lp->pool_metadata_lv_name && + if (lp->pool_metadata_name && !lv_rename_update(cmd, metadata_lv, metadata_name, 0)) return_0; diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 0dc3699..2fa7918 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -54,9 +54,9 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, if (!validate_lvname_param(cmd, &lp->vg_name, &lp->lv_name)) return_0; - lp->pool = arg_str_value(cmd, thinpool_ARG, NULL) + lp->pool_name = arg_str_value(cmd, thinpool_ARG, NULL) ? : arg_str_value(cmd, cachepool_ARG, NULL); - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool)) + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->pool_name)) return_0; if (seg_is_cache(lp)) { @@ -73,7 +73,7 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, * or whether it is the origin for cached LV. */ if (!argc) { - if (!lp->pool) { + if (!lp->pool_name) { /* Don't advertise we could handle cache origin */ log_error("Please specify a logical volume to act as the cache pool."); return 0; @@ -86,25 +86,25 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, return_0; } else { /* Lets pretend it's cache origin for now */ - lp->origin = vg_name; - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin)) + lp->origin_name = vg_name; + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin_name)) return_0; - if (lp->pool) { - if (strcmp(lp->pool, lp->origin)) { + if (lp->pool_name) { + if (strcmp(lp->pool_name, lp->origin_name)) { log_error("Unsupported syntax, cannot use cache origin %s and --cachepool %s.", - lp->origin, lp->pool); + lp->origin_name, lp->pool_name); /* Stop here, only older form remains supported */ return 0; } - lp->origin = NULL; + lp->origin_name = NULL; } else { /* * Gambling here, could be cache pool or cache origin, * detection is possible after openning vg, * yet we need to parse pool args */ - lp->pool = lp->origin; + lp->pool_name = lp->origin_name; lp->create_pool = 1; } } @@ -121,7 +121,7 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, return 0; } - if (!lp->pool) { + if (!lp->pool_name) { log_error("Creation of cached volume and cache pool " "in one command is not yet supported."); return 0; @@ -136,8 +136,8 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, return 0; } - lp->origin = argv[0]; - if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin)) + lp->origin_name = argv[0]; + if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin_name)) return_0; if (!lp->vg_name && @@ -162,13 +162,13 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, if (!validate_lvname_param(cmd, &lp->vg_name, &vg_name)) return_0; - if (lp->pool && - (strcmp(vg_name, lp->pool) != 0)) { + if (lp->pool_name && + (strcmp(vg_name, lp->pool_name) != 0)) { log_error("Ambiguous %s name specified, %s and %s.", - lp->segtype->name, vg_name, lp->pool); + lp->segtype->name, vg_name, lp->pool_name); return 0; } - lp->pool = vg_name; + lp->pool_name = vg_name; if (!lp->vg_name && !_set_vg_name(lp, extract_vgname(cmd, NULL))) @@ -207,16 +207,16 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, /* support --name & --type {thin|cache}-pool */ if (seg_is_pool(lp) && lp->lv_name) { - if (lp->pool && (strcmp(lp->lv_name, lp->pool) != 0)) { + if (lp->pool_name && (strcmp(lp->lv_name, lp->pool_name) != 0)) { log_error("Ambiguous %s name specified, %s and %s.", - lp->segtype->name, lp->lv_name, lp->pool); + lp->segtype->name, lp->lv_name, lp->pool_name); return 0; } - lp->pool = lp->lv_name; + lp->pool_name = lp->lv_name; lp->lv_name = NULL; } - if (lp->pool && lp->lv_name && !strcmp(lp->pool, lp->lv_name)) { + if (lp->pool_name && lp->lv_name && !strcmp(lp->pool_name, lp->lv_name)) { log_error("Logical volume name %s and pool name must be different.", lp->lv_name); return 0; @@ -239,9 +239,9 @@ static int _determine_snapshot_type(struct volume_group *vg, { struct logical_volume *lv, *pool_lv = NULL; - if (!(lv = find_lv(vg, lp->origin))) { + if (!(lv = find_lv(vg, lp->origin_name))) { log_error("Snapshot origin LV %s not found in Volume group %s.", - lp->origin, vg->name); + lp->origin_name, vg->name); return 0; } @@ -250,10 +250,10 @@ static int _determine_snapshot_type(struct volume_group *vg, return 0; } - if (lp->pool) { - if (!(pool_lv = find_lv(vg, lp->pool))) { + if (lp->pool_name) { + if (!(pool_lv = find_lv(vg, lp->pool_name))) { log_error("Thin pool volume %s not found in Volume group %s.", - lp->pool, vg->name); + lp->pool_name, vg->name); return 0; } @@ -265,10 +265,10 @@ static int _determine_snapshot_type(struct volume_group *vg, } if (!arg_count(vg->cmd, extents_ARG) && !arg_count(vg->cmd, size_ARG)) { - if (lv_is_thin_volume(lv) && !lp->pool) - lp->pool = first_seg(lv)->pool_lv->name; + if (lv_is_thin_volume(lv) && !lp->pool_name) + lp->pool_name = first_seg(lv)->pool_lv->name; - if (seg_is_thin(lp) || lp->pool) { + if (seg_is_thin(lp) || lp->pool_name) { if (!(lp->segtype = get_segtype_from_string(vg->cmd, "thin"))) return_0; return 1; @@ -276,7 +276,7 @@ static int _determine_snapshot_type(struct volume_group *vg, log_error("Please specify either size or extents with snapshots."); return 0; - } else if (lp->pool) { + } else if (lp->pool_name) { log_error("Cannot specify size with thin pool snapshot."); return 0; } @@ -289,7 +289,7 @@ static int _lvcreate_update_pool_params(struct volume_group *vg, { return update_pool_params(lp->segtype, vg, lp->target_attr, lp->passed_args, lp->extents, - &lp->poolmetadatasize, + &lp->pool_metadata_size, &lp->thin_chunk_size_calc_policy, &lp->chunk_size, &lp->discards, &lp->zero); } @@ -316,23 +316,23 @@ static int _determine_cache_argument(struct volume_group *vg, return 0; } - if (!lp->pool) { - lp->pool = lp->lv_name; - } else if (lp->pool == lp->origin) { - if (!(lv = find_lv(vg, lp->pool))) { + if (!lp->pool_name) { + lp->pool_name = lp->lv_name; + } else if (lp->pool_name == lp->origin_name) { + if (!(lv = find_lv(vg, lp->pool_name))) { /* Cache pool nor origin volume exists */ lp->cache = 0; - lp->origin = NULL; + lp->origin_name = NULL; if (!(lp->segtype = get_segtype_from_string(vg->cmd, "cache-pool"))) return_0; } else if (!lv_is_cache_pool(lv)) { /* Name arg in this case is for pool name */ - lp->pool = lp->lv_name; + lp->pool_name = lp->lv_name; /* We were given origin for caching */ } else { /* FIXME error on pool args */ lp->create_pool = 0; - lp->origin = NULL; + lp->origin_name = NULL; } } @@ -350,7 +350,7 @@ static int _update_extents_params(struct volume_group *vg, struct lvcreate_cmdline_params *lcp) { uint32_t pv_extent_count; - struct logical_volume *origin = NULL; + struct logical_volume *origin_lv = NULL; uint32_t size_rest; uint32_t stripesize_extents; uint32_t extents; @@ -395,19 +395,19 @@ static int _update_extents_params(struct volume_group *vg, "or %%FREE.", (lp->snapshot) ? "%ORIGIN, " : ""); return 0; case PERCENT_ORIGIN: - if (lp->snapshot && lp->origin && - !(origin = find_lv(vg, lp->origin))) { + if (lp->snapshot && lp->origin_name && + !(origin_lv = find_lv(vg, lp->origin_name))) { log_error("Couldn't find origin volume '%s'.", - lp->origin); + lp->origin_name); return 0; } - if (!origin) { + if (!origin_lv) { log_error(INTERNAL_ERROR "Couldn't find origin volume."); return 0; } /* Add whole metadata size estimation */ - extents = cow_max_extents(origin, lp->chunk_size) - origin->le_count + - percent_of_extents(lp->extents, origin->le_count, 1); + extents = cow_max_extents(origin_lv, lp->chunk_size) - origin_lv->le_count + + percent_of_extents(lp->extents, origin_lv->le_count, 1); break; case PERCENT_NONE: extents = lp->extents; @@ -424,19 +424,19 @@ static int _update_extents_params(struct volume_group *vg, lp->extents = extents; } - if (lp->snapshot && lp->origin && lp->extents) { + if (lp->snapshot && lp->origin_name && lp->extents) { if (!lp->chunk_size) { log_error(INTERNAL_ERROR "Missing snapshot chunk size."); return 0; } - if (!origin && !(origin = find_lv(vg, lp->origin))) { + if (!origin_lv && !(origin_lv = find_lv(vg, lp->origin_name))) { log_error("Couldn't find origin volume '%s'.", - lp->origin); + lp->origin_name); return 0; } - extents = cow_max_extents(origin, lp->chunk_size); + extents = cow_max_extents(origin_lv, lp->chunk_size); if (extents < lp->extents) { log_print_unless_silent("Reducing COW size %s down to maximum usable size %s.", @@ -462,16 +462,16 @@ static int _update_extents_params(struct volume_group *vg, if (!_lvcreate_update_pool_params(vg, lp)) return_0; - if (!(lp->poolmetadataextents = - extents_from_size(vg->cmd, lp->poolmetadatasize, vg->extent_size))) + if (!(lp->pool_metadata_extents = + extents_from_size(vg->cmd, lp->pool_metadata_size, vg->extent_size))) return_0; if (lcp->percent == PERCENT_FREE) { - if (lp->extents <= (2 * lp->poolmetadataextents)) { + if (lp->extents <= (2 * lp->pool_metadata_extents)) { log_error("Not enough space for thin pool creation."); return 0; } /* FIXME: persistent hidden space in VG wanted */ - lp->extents -= (2 * lp->poolmetadataextents); + lp->extents -= (2 * lp->pool_metadata_extents); } } @@ -1016,7 +1016,7 @@ static int _lvcreate_params(struct lvcreate_params *lp, !get_stripe_params(cmd, &lp->stripes, &lp->stripe_size) || (lp->create_pool && !get_pool_params(cmd, lp->segtype, &lp->passed_args, - &lp->poolmetadatasize, &lp->poolmetadataspare, + &lp->pool_metadata_size, &lp->pool_metadata_spare, &lp->chunk_size, &lp->discards, &lp->zero)) || !_read_mirror_params(lp, cmd) || !_read_raid_params(lp, cmd) || @@ -1095,8 +1095,8 @@ static int _check_thin_parameters(struct volume_group *vg, struct lvcreate_param return 0; } - if (lp->pool) - pool_lv = find_lv(vg, lp->pool); + if (lp->pool_name) + pool_lv = find_lv(vg, lp->pool_name); if (!lp->create_pool) { if (arg_from_list_is_set(vg->cmd, "is only available with thin pool creation", @@ -1117,13 +1117,13 @@ static int _check_thin_parameters(struct volume_group *vg, struct lvcreate_param return 0; } - if (!lp->pool) { + if (!lp->pool_name) { log_error("Please specify name of existing thin pool."); return 0; } if (!pool_lv) { - log_error("Thin pool %s not found in Volume group %s.", lp->pool, vg->name); + log_error("Thin pool %s not found in Volume group %s.", lp->pool_name, vg->name); return 0; } @@ -1132,7 +1132,7 @@ static int _check_thin_parameters(struct volume_group *vg, struct lvcreate_param return 0; } } else if (pool_lv) { - log_error("Logical volume %s already exists in Volume group %s.", lp->pool, vg->name); + log_error("Logical volume %s already exists in Volume group %s.", lp->pool_name, vg->name); return 0; } @@ -1213,12 +1213,12 @@ static int _validate_internal_thin_processing(const struct lvcreate_params *lp) 1 0 1 1 y - create thin snapshot of existing thin LV */ - if (!lp->create_pool && !lp->pool) { + if (!lp->create_pool && !lp->pool_name) { log_error(INTERNAL_ERROR "--thinpool not identified."); r = 0; } - if ((lp->snapshot && !lp->origin) || (!lp->snapshot && lp->origin)) { + if ((lp->snapshot && !lp->origin_name) || (!lp->snapshot && lp->origin_name)) { log_error(INTERNAL_ERROR "Inconsistent snapshot and origin parameters identified."); r = 0; } @@ -1256,7 +1256,7 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv) return_ECMD_FAILED; } - if (lp.snapshot && lp.origin && !_determine_snapshot_type(vg, &lp)) + if (lp.snapshot && lp.origin_name && !_determine_snapshot_type(vg, &lp)) goto_out; if (seg_is_thin(&lp) && !_check_thin_parameters(vg, &lp, &lcp)) @@ -1282,20 +1282,20 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv) goto_out; if (lp.create_pool) { - if (!handle_pool_metadata_spare(vg, lp.poolmetadataextents, - lp.pvh, lp.poolmetadataspare)) + if (!handle_pool_metadata_spare(vg, lp.pool_metadata_extents, + lp.pvh, lp.pool_metadata_spare)) goto_out; log_verbose("Making pool %s in VG %s using segtype %s", - lp.pool ? : "with generated name", lp.vg_name, lp.segtype->name); + lp.pool_name ? : "with generated name", lp.vg_name, lp.segtype->name); } if (lp.thin) log_verbose("Making thin LV %s in pool %s in VG %s%s%s using segtype %s", lp.lv_name ? : "with generated name", - lp.pool ? : "with generated name", lp.vg_name, + lp.pool_name ? : "with generated name", lp.vg_name, lp.snapshot ? " as snapshot of " : "", - lp.snapshot ? lp.origin : "", lp.segtype->name); + lp.snapshot ? lp.origin_name : "", lp.segtype->name); if (!lv_create_single(vg, &lp)) goto_out;

1 0

master - tests: typos
by Zdenek Kabelac 07 Oct '14

07 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=62802ddae052e9af… Commit: 62802ddae052e9af996a4366bdcd5a9f2ec713d1 Parent: 236db9fc0df9784d559fbce49a9fcb5e642e6445 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Oct 6 23:25:49 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Oct 7 10:19:33 2014 +0200 tests: typos --- test/shell/lvcreate-cache.sh | 2 +- test/shell/lvcreate-thin.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh index 3bc8f40..17b8c09 100644 --- a/test/shell/lvcreate-cache.sh +++ b/test/shell/lvcreate-cache.sh @@ -66,7 +66,7 @@ check lv_field $vg/pool7 segtype "cache-pool" lvremove -f $vg -# Validate ambiguos pool name is detected +# Validate ambiguous pool name is detected invalid lvcreate -l 1 --type cache-pool --cachepool pool1 $vg/pool2 invalid lvcreate -l 1 --type cache-pool --name pool3 --cachepool pool4 $vg invalid lvcreate -l 1 --type cache-pool --name pool6 --cachepool pool6 $vg/pool7 diff --git a/test/shell/lvcreate-thin.sh b/test/shell/lvcreate-thin.sh index 42ea635..16eb1e7 100644 --- a/test/shell/lvcreate-thin.sh +++ b/test/shell/lvcreate-thin.sh @@ -51,7 +51,7 @@ check vg_field $vg lv_count 0 # Let's pretend pool is like normal LV when using --type thin-pool support --name -# Reject ambigous thin pool names +# Reject ambiguous thin pool names invalid lvcreate --type thin-pool -l1 --name pool1 $vg/pool2 invalid lvcreate --type thin-pool -l1 --name pool3 --thinpool pool4 $vg invalid lvcreate --type thin-pool -l1 --name pool5 --thinpool pool6 $vg/pool7 @@ -60,7 +60,7 @@ check vg_field $vg lv_count 0 lvcreate --type thin-pool -l1 --name pool1 $vg lvcreate --type thin-pool -l1 --name $vg/pool2 -# If the thin pool name is unambigous let it proceed +# If the thin pool name is unambiguous let it proceed lvcreate --type thin-pool -l1 --name pool3 $vg/pool3 lvcreate --type thin-pool -l1 --name pool4 --thinpool $vg/pool4 lvcreate --type thin-pool -l1 --name pool5 --thinpool $vg/pool5 $vg/pool5

1 0

master - tests: put devs into ""
by Zdenek Kabelac 07 Oct '14

07 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=236db9fc0df9784d… Commit: 236db9fc0df9784d559fbce49a9fcb5e642e6445 Parent: 75c4d268e9b0b70c58f8b8b018fe200aca7b8bb2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Oct 7 09:54:47 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Oct 7 10:19:33 2014 +0200 tests: put devs into "" --- test/shell/lvextend-thin.sh | 2 +- test/shell/lvmetad-dump.sh | 2 +- test/shell/lvmetad-lvm1.sh | 2 +- test/shell/lvmetad-lvscan-cache.sh | 4 +- test/shell/lvmetad-override.sh | 2 +- test/shell/lvmetad-pvscan-cache.sh | 2 +- test/shell/lvmetad-pvscan-md.sh | 4 +- test/shell/lvresize-usage.sh | 4 +- test/shell/mirror-names.sh | 4 +- test/shell/process-each-pv-nomda-all.sh | 46 +- test/shell/process-each-pv-nomda.sh | 14 +- test/shell/process-each-pv.sh | 1898 +++++++++++++++---------------- test/shell/process-each-pvresize.sh | 707 ++++++------ test/shell/pvchange-usage.sh | 2 +- test/shell/pvcreate-bootloaderarea.sh | 2 +- test/shell/pvmove-background.sh | 2 +- test/shell/report-select.sh | 10 +- 17 files changed, 1351 insertions(+), 1356 deletions(-) diff --git a/test/shell/lvextend-thin.sh b/test/shell/lvextend-thin.sh index 1a0b440..f9e24ce 100644 --- a/test/shell/lvextend-thin.sh +++ b/test/shell/lvextend-thin.sh @@ -15,5 +15,5 @@ aux have_thin 1 0 0 || skip aux prepare_vg 3 lvcreate -i2 -l2 -T $vg/pool2 -lvextend -l+2 $vg/pool2 $dev2 $dev3 +lvextend -l+2 $vg/pool2 "$dev2" "$dev3" should lvextend -l+100%FREE $vg/pool2 diff --git a/test/shell/lvmetad-dump.sh b/test/shell/lvmetad-dump.sh index 0c3df3b..14d5753 100644 --- a/test/shell/lvmetad-dump.sh +++ b/test/shell/lvmetad-dump.sh @@ -13,7 +13,7 @@ test -e LOCAL_LVMETAD || skip aux prepare_pvs 2 -vgcreate $vg1 $dev1 $dev2 +vgcreate $vg1 "$dev1" "$dev2" lvcreate -n bar -l 1 $vg1 (echo | aux lvmetad_talk) || skip diff --git a/test/shell/lvmetad-lvm1.sh b/test/shell/lvmetad-lvm1.sh index 3745dd0..f071b14 100644 --- a/test/shell/lvmetad-lvm1.sh +++ b/test/shell/lvmetad-lvm1.sh @@ -25,7 +25,7 @@ pvs | should grep "$dev1" pvcreate -ff -y --metadatatype 1 "$dev1" "$dev2" vgcreate --metadatatype 1 $vg1 "$dev1" "$dev2" lvcreate -l1 $vg1 -pvremove -ff -y $dev2 +pvremove -ff -y "$dev2" vgchange -an $vg1 not lvremove $vg1 not vgremove -ff -y $vg1 diff --git a/test/shell/lvmetad-lvscan-cache.sh b/test/shell/lvmetad-lvscan-cache.sh index 529753c..e63fd20 100644 --- a/test/shell/lvmetad-lvscan-cache.sh +++ b/test/shell/lvmetad-lvscan-cache.sh @@ -15,7 +15,7 @@ test -e LOCAL_LVMETAD || skip aux prepare_pvs 2 -vgcreate $vg1 $dev1 $dev2 +vgcreate $vg1 "$dev1" "$dev2" lvcreate -n testlv -m 1 -l 1 $vg1 vgs | grep $vg1 @@ -23,7 +23,7 @@ lvscan --cache $vg1/testlv vgs | grep $vg1 -aux disable_dev $dev2 +aux disable_dev "$dev2" # pvscan --cache already ran for the disabled device above, this should be a # no-op (but should not segfault!) diff --git a/test/shell/lvmetad-override.sh b/test/shell/lvmetad-override.sh index 27f15cb..ea76b35 100644 --- a/test/shell/lvmetad-override.sh +++ b/test/shell/lvmetad-override.sh @@ -14,7 +14,7 @@ test -e LOCAL_LVMETAD || skip aux prepare_pvs 2 -vgcreate $vg1 $dev1 $dev2 +vgcreate $vg1 "$dev1" "$dev2" lvchange -ay $vg1 2>&1 | not grep "Failed to connect" kill $(< LOCAL_LVMETAD) lvchange -ay $vg1 2>&1 | grep "Failed to connect" diff --git a/test/shell/lvmetad-pvscan-cache.sh b/test/shell/lvmetad-pvscan-cache.sh index d309e82..5c48817 100644 --- a/test/shell/lvmetad-pvscan-cache.sh +++ b/test/shell/lvmetad-pvscan-cache.sh @@ -15,7 +15,7 @@ test -e LOCAL_LVMETAD || skip aux prepare_pvs 2 -vgcreate $vg1 $dev1 $dev2 +vgcreate $vg1 "$dev1" "$dev2" vgs | grep $vg1 pvscan --cache diff --git a/test/shell/lvmetad-pvscan-md.sh b/test/shell/lvmetad-pvscan-md.sh index dd85bb6..449369d 100644 --- a/test/shell/lvmetad-pvscan-md.sh +++ b/test/shell/lvmetad-pvscan-md.sh @@ -73,5 +73,5 @@ not pvscan --cache "$dev1" 2>&1 | grep "not found" not pvscan --cache "$dev2" 2>&1 | grep "not found" pvs | grep $lvmdev -pvs | not grep $dev1 -pvs | not grep $dev2 +pvs | not grep "$dev1" +pvs | not grep "$dev2" diff --git a/test/shell/lvresize-usage.sh b/test/shell/lvresize-usage.sh index a235838..a3ba2cf 100644 --- a/test/shell/lvresize-usage.sh +++ b/test/shell/lvresize-usage.sh @@ -27,8 +27,8 @@ grep "Reducing stripe size" err lvremove -ff $vg -lvcreate -L 10M -n lv $vg $dev1 -lvextend -L +10M $vg/lv $dev2 +lvcreate -L 10M -n lv $vg "$dev1" +lvextend -L +10M $vg/lv "$dev2" # Attempt to reduce with lvextend and vice versa: not lvextend -L 16M $vg/lv diff --git a/test/shell/mirror-names.sh b/test/shell/mirror-names.sh index 0e064ed..9022ff9 100644 --- a/test/shell/mirror-names.sh +++ b/test/shell/mirror-names.sh @@ -27,8 +27,8 @@ lv_devices_() { devs=$(get lv_devices "$lv") for d in $devs; do - (echo "$devices" | grep $d) || return 1 - devices=$(echo $devices | sed "s/$d//") + (echo "$devices" | grep "$d") || return 1 + devices=$(echo "$devices" | sed "s/$d//") done test -z "$(echo $devices | sed 's/ //g')" diff --git a/test/shell/process-each-pv-nomda-all.sh b/test/shell/process-each-pv-nomda-all.sh index ae9f8e5..93eb0bd 100644 --- a/test/shell/process-each-pv-nomda-all.sh +++ b/test/shell/process-each-pv-nomda-all.sh @@ -16,19 +16,19 @@ test_description='Test process_each_pv with zero mda' aux prepare_devs 14 # for vg1 -pvcreate $dev10 +pvcreate "$dev10" # for vg2 -pvcreate $dev2 --metadatacopies 0 -pvcreate $dev3 -pvcreate $dev4 -pvcreate $dev5 +pvcreate "$dev2" --metadatacopies 0 +pvcreate "$dev3" +pvcreate "$dev4" +pvcreate "$dev5" # for vg3 -pvcreate $dev6 --metadatacopies 0 -pvcreate $dev7 --metadatacopies 0 -pvcreate $dev8 --metadatacopies 0 -pvcreate $dev9 +pvcreate "$dev6" --metadatacopies 0 +pvcreate "$dev7" --metadatacopies 0 +pvcreate "$dev8" --metadatacopies 0 +pvcreate "$dev9" # orphan with mda pvcreate "$dev11" @@ -43,18 +43,18 @@ vgcreate $vg1 "$dev10" vgcreate $vg2 "$dev2" "$dev3" "$dev4" "$dev5" vgcreate $vg3 "$dev6" "$dev7" "$dev8" "$dev9" -pvs -a >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -grep $dev12 err -grep $dev13 err -grep $dev14 err +pvs -a | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +grep "$dev12" err +grep "$dev13" err +grep "$dev14" err diff --git a/test/shell/process-each-pv-nomda.sh b/test/shell/process-each-pv-nomda.sh index 10ce878..82e6bc4 100644 --- a/test/shell/process-each-pv-nomda.sh +++ b/test/shell/process-each-pv-nomda.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. +# Copyright (C) 2014 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 @@ -15,13 +15,11 @@ test_description='Test process_each_pv with zero mda' aux prepare_devs 2 -pvcreate $dev1 --metadatacopies 0 -pvcreate $dev2 +pvcreate "$dev1" --metadatacopies 0 +pvcreate "$dev2" vgcreate $vg1 "$dev1" "$dev2" -pvdisplay -a -C >err -cat err -grep $dev1 err -grep $dev2 err - +pvdisplay -a -C | tee err +grep "$dev1" err +grep "$dev2" err diff --git a/test/shell/process-each-pv.sh b/test/shell/process-each-pv.sh index a24b80b..d3a1863 100644 --- a/test/shell/process-each-pv.sh +++ b/test/shell/process-each-pv.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. +# Copyright (C) 2014 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 @@ -66,340 +66,340 @@ pvcreate "$dev14" # # pv in vg -pvdisplay -s $dev10 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s "$dev10" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # pv not in vg (one orphan) -pvdisplay -s $dev11 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # dev is not a pv -not pvdisplay -s $dev12 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvdisplay -s "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # two pvs in different vgs -pvdisplay -s $dev10 $dev2 >err -grep $dev10 err -grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s "$dev10" "$dev2" | tee err +grep "$dev10" err +grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # -a is invalid when used alone -not pvdisplay -a >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvdisplay -a | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one pv and one orphan -pvdisplay -s $dev10 $dev11 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s "$dev10" "$dev11" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one pv and one dev (dev refers to a non-pv device) -not pvdisplay -s $dev10 $dev12 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvdisplay -s "$dev10" "$dev12" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one orphan and one dev -not pvdisplay -s $dev11 $dev12 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvdisplay -s "$dev11" "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # all pvs (pvs in vgs and orphan pvs) -pvdisplay -s >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvdisplay -s | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # all devs (pvs in vgs, orphan pvs, and devs) -pvdisplay -a -C >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -grep $dev12 err -grep $dev13 err -grep $dev14 err +pvdisplay -a -C | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +grep "$dev12" err +grep "$dev13" err +grep "$dev14" err # pv and orphan and dev -not pvdisplay -s $dev9 $dev11 $dev12 > err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvdisplay -s "$dev9" "$dev11" "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # -s option not allowed with -a -C -not pvdisplay -s -a -C > err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvdisplay -s -a -C | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # pv and all (all ignored) -pvdisplay -a -C $dev9 > err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -a -C "$dev9" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # orphan and all (all ignored) -pvdisplay -a -C $dev11 > err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -a -C "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one tag -pvdisplay -s @V2D3 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s @V2D3 | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # two tags -pvdisplay -s @V2D3 @V2D45 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s @V2D3 @V2D45 | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and pv -pvdisplay -s @V2D3 $dev4 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s @V2D3 "$dev4" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and orphan -pvdisplay -s @V2D3 $dev11 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s @V2D3 "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and dev -not pvdisplay -s @V2D3 $dev12 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvdisplay -s @V2D3 "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and all (all ignored) -pvdisplay @V2D3 -a -C > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay @V2D3 -a -C | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and pv redundant -pvdisplay -s @V2D3 $dev3 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s @V2D3 "$dev3" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # @@ -407,308 +407,308 @@ not grep $dev14 err # # pv in vg -pvs $dev10 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs "$dev10" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # pv not in vg (one orphan) -pvs $dev11 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # dev is not a pv -not pvs $dev12 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvs "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # two pvs in different vgs -pvs $dev10 $dev2 >err -grep $dev10 err -grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs "$dev10" "$dev2" | tee err +grep "$dev10" err +grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one pv and one orphan -pvs $dev10 $dev11 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs "$dev10" "$dev11" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one pv and one dev -not pvs $dev10 $dev12 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvs "$dev10" "$dev12" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one orphan and one dev -not pvs $dev11 $dev12 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvs "$dev11" "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # all pvs (pvs in vgs and orphan pvs) -pvs >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvs | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # all devs (pvs in vgs, orphan pvs, and devs) -pvs -a >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -grep $dev12 err -grep $dev13 err -grep $dev14 err +pvs -a | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +grep "$dev12" err +grep "$dev13" err +grep "$dev14" err # pv and orphan and dev -not pvs $dev9 $dev11 $dev12 > err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvs "$dev9" "$dev11" "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # pv and all (all ignored) -pvs -a $dev9 > err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs -a "$dev9" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # orphan and all (all ignored) -pvs -a $dev11 > err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs -a "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # one tag -pvs @V2D3 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V2D3 | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # two tags -pvs @V2D3 @V2D45 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V2D3 @V2D45 | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and pv -pvs @V2D3 $dev4 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V2D3 "$dev4" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and orphan -pvs @V2D3 $dev11 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V2D3 "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and dev -not pvs @V2D3 $dev12 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +not pvs @V2D3 "$dev12" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and all (all ignored) -pvs @V2D3 -a > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V2D3 -a | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag and pv redundant -pvs @V2D3 $dev3 > err -not grep $dev10 err -not grep $dev2 err -grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V2D3 "$dev3" | tee err +not grep "$dev10" err +not grep "$dev2" err +grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # @@ -720,73 +720,73 @@ not vgreduce $vg2 # fail with dev and -a -not vgreduce $vg2 $dev2 -a -check pv_field $dev2 vg_name $vg2 -check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +not vgreduce $vg2 "$dev2" -a +check pv_field "$dev2" vg_name $vg2 +check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # remove one pv -vgreduce $vg2 $dev2 -not check pv_field $dev2 vg_name $vg2 -check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +vgreduce $vg2 "$dev2" +not check pv_field "$dev2" vg_name $vg2 +check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev2 +vgextend $vg2 "$dev2" # remove two pvs -vgreduce $vg2 $dev2 $dev3 -not check pv_field $dev2 vg_name $vg2 -not check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +vgreduce $vg2 "$dev2" "$dev3" +not check pv_field "$dev2" vg_name $vg2 +not check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev2 $dev3 +vgextend $vg2 "$dev2" "$dev3" pvchange --addtag V2D3 "$dev3" # remove one pv with tag vgreduce $vg2 @V2D3 -check pv_field $dev2 vg_name $vg2 -not check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +check pv_field "$dev2" vg_name $vg2 +not check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev3 +vgextend $vg2 "$dev3" pvchange --addtag V2D3 "$dev3" # remove two pvs, each with different tag vgreduce $vg2 @V2D3 @V2D4 -check pv_field $dev2 vg_name $vg2 -not check pv_field $dev3 vg_name $vg2 -not check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +check pv_field "$dev2" vg_name $vg2 +not check pv_field "$dev3" vg_name $vg2 +not check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev3 $dev4 +vgextend $vg2 "$dev3" "$dev4" pvchange --addtag V2D3 "$dev3" pvchange --addtag V2D4 "$dev4" pvchange --addtag V2D45 "$dev4" @@ -794,16 +794,16 @@ pvchange --addtag V2D45 "$dev4" # remove two pvs, both with same tag vgreduce $vg2 @V2D45 -check pv_field $dev2 vg_name $vg2 -check pv_field $dev3 vg_name $vg2 -not check pv_field $dev4 vg_name $vg2 -not check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +check pv_field "$dev2" vg_name $vg2 +check pv_field "$dev3" vg_name $vg2 +not check pv_field "$dev4" vg_name $vg2 +not check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev4 $dev5 +vgextend $vg2 "$dev4" "$dev5" pvchange --addtag V2D4 "$dev4" pvchange --addtag V2D45 "$dev4" pvchange --addtag V2D5 "$dev5" @@ -811,17 +811,17 @@ pvchange --addtag V2D45 "$dev5" # remove two pvs, one by name, one by tag -vgreduce $vg2 $dev2 @V2D3 -not check pv_field $dev2 vg_name $vg2 -not check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +vgreduce $vg2 "$dev2" @V2D3 +not check pv_field "$dev2" vg_name $vg2 +not check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev2 $dev3 +vgextend $vg2 "$dev2" "$dev3" pvchange --addtag V2D3 "$dev3" @@ -829,16 +829,16 @@ pvchange --addtag V2D3 "$dev3" pvchange --addtag V2D5V3D9 "$dev5" pvchange --addtag V2D5V3D9 "$dev9" vgreduce $vg2 @V2D5V3D9 -check pv_field $dev2 vg_name $vg2 -check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -not check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +check pv_field "$dev2" vg_name $vg2 +check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +not check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev5 +vgextend $vg2 "$dev5" pvchange --addtag V2D5 "$dev5" pvchange --addtag V2D45 "$dev5" @@ -857,18 +857,18 @@ pvchange --addtag V2D45 "$dev5" # lvcreate on one pv to make it used # remove all unused pvs -lvcreate -n $lv1 -l 2 $vg2 $dev2 +lvcreate -n $lv1 -l 2 $vg2 "$dev2" not vgreduce -a $vg2 -check pv_field $dev2 vg_name $vg2 -not check pv_field $dev3 vg_name $vg2 -not check pv_field $dev4 vg_name $vg2 -not check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +check pv_field "$dev2" vg_name $vg2 +not check pv_field "$dev3" vg_name $vg2 +not check pv_field "$dev4" vg_name $vg2 +not check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev3 $dev4 $dev5 +vgextend $vg2 "$dev3" "$dev4" "$dev5" pvchange --addtag V2D3 "$dev3" pvchange --addtag V2D4 "$dev4" pvchange --addtag V2D45 "$dev4" @@ -886,25 +886,25 @@ lvremove $vg2/$lv1 vgremove $vg1 vgremove $vg2 vgremove $vg3 -pvremove $dev11 -pvremove $dev14 +pvremove "$dev11" +pvremove "$dev14" # new config with some pvs that have zero mdas # for vg1 -pvcreate $dev10 +pvcreate "$dev10" # for vg2 -pvcreate $dev2 --metadatacopies 0 -pvcreate $dev3 -pvcreate $dev4 -pvcreate $dev5 +pvcreate "$dev2" --metadatacopies 0 +pvcreate "$dev3" +pvcreate "$dev4" +pvcreate "$dev5" # for vg3 -pvcreate $dev6 --metadatacopies 0 -pvcreate $dev7 --metadatacopies 0 -pvcreate $dev8 --metadatacopies 0 -pvcreate $dev9 +pvcreate "$dev6" --metadatacopies 0 +pvcreate "$dev7" --metadatacopies 0 +pvcreate "$dev8" --metadatacopies 0 +pvcreate "$dev9" # orphan with mda pvcreate "$dev11" @@ -935,296 +935,296 @@ pvchange --addtag V3D9 "$dev9" # # pv with mda -pvdisplay -s $dev10 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s "$dev10" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # pv without mda -pvdisplay -s $dev2 >err -not grep $dev10 err -grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s "$dev2" | tee err +not grep "$dev10" err +grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # orphan with mda -pvdisplay -s $dev11 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # orphan without mda -pvdisplay -s $dev14 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvdisplay -s "$dev14" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # pv with mda, pv without mda, orphan with mda, orphan without mda -pvdisplay -s $dev10 $dev2 $dev11 $dev14 >err -grep $dev10 err -grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvdisplay -s "$dev10" "$dev2" "$dev11" "$dev14" | tee err +grep "$dev10" err +grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # tag refering to pv with mda and pv without mda -pvdisplay -s @V3 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s @V3 | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag refering to one pv without mda -pvdisplay -s @V3D8 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvdisplay -s @V3D8 | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # all pvs (pvs in vgs and orphan pvs) -pvdisplay -s >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvdisplay -s | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # all devs (pvs in vgs, orphan pvs, and devs) -pvdisplay -a -C >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -grep $dev12 err -grep $dev13 err -grep $dev14 err +pvdisplay -a -C | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +grep "$dev12" err +grep "$dev13" err +grep "$dev14" err # # pvs including pvs without mdas # # pv with mda -pvs $dev10 >err -grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs "$dev10" | tee err +grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # pv without mda -pvs $dev2 >err -not grep $dev10 err -grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs "$dev2" | tee err +not grep "$dev10" err +grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # orphan with mda -pvs $dev11 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs "$dev11" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # orphan without mda -pvs $dev14 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvs "$dev14" | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # pv with mda, pv without mda, orphan with mda, orphan without mda -pvs $dev10 $dev2 $dev11 $dev14 >err -grep $dev10 err -grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -not grep $dev8 err -not grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvs "$dev10" "$dev2" "$dev11" "$dev14" | tee err +grep "$dev10" err +grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +not grep "$dev8" err +not grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # tag refering to pv with mda and pv without mda -pvs @V3 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V3 | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # tag refering to one pv without mda -pvs @V3D8 >err -not grep $dev10 err -not grep $dev2 err -not grep $dev3 err -not grep $dev4 err -not grep $dev5 err -not grep $dev6 err -not grep $dev7 err -grep $dev8 err -not grep $dev9 err -not grep $dev11 err -not grep $dev12 err -not grep $dev13 err -not grep $dev14 err +pvs @V3D8 | tee err +not grep "$dev10" err +not grep "$dev2" err +not grep "$dev3" err +not grep "$dev4" err +not grep "$dev5" err +not grep "$dev6" err +not grep "$dev7" err +grep "$dev8" err +not grep "$dev9" err +not grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +not grep "$dev14" err # all pvs (pvs in vgs and orphan pvs) -pvs >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -not grep $dev12 err -not grep $dev13 err -grep $dev14 err +pvs | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +not grep "$dev12" err +not grep "$dev13" err +grep "$dev14" err # all devs (pvs in vgs, orphan pvs, and devs) -pvs -a >err -grep $dev10 err -grep $dev2 err -grep $dev3 err -grep $dev4 err -grep $dev5 err -grep $dev6 err -grep $dev7 err -grep $dev8 err -grep $dev9 err -grep $dev11 err -grep $dev12 err -grep $dev13 err -grep $dev14 err +pvs -a | tee err +grep "$dev10" err +grep "$dev2" err +grep "$dev3" err +grep "$dev4" err +grep "$dev5" err +grep "$dev6" err +grep "$dev7" err +grep "$dev8" err +grep "$dev9" err +grep "$dev11" err +grep "$dev12" err +grep "$dev13" err +grep "$dev14" err # @@ -1232,54 +1232,52 @@ grep $dev14 err # # remove pv without mda -vgreduce $vg2 $dev2 -not check pv_field $dev2 vg_name $vg2 -check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +vgreduce $vg2 "$dev2" +not check pv_field "$dev2" vg_name $vg2 +check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev2 +vgextend $vg2 "$dev2" # remove pv with mda and pv without mda -vgreduce $vg2 $dev2 $dev3 -not check pv_field $dev2 vg_name $vg2 -not check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 +vgreduce $vg2 "$dev2" "$dev3" +not check pv_field "$dev2" vg_name $vg2 +not check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 # reset -vgextend $vg2 $dev2 -vgextend $vg2 $dev3 +vgextend $vg2 "$dev2" +vgextend $vg2 "$dev3" # fail to remove only pv with mda -not vgreduce $vg3 $dev9 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 -check pv_field $dev2 vg_name $vg2 -check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 +not vgreduce $vg3 "$dev9" +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 +check pv_field "$dev2" vg_name $vg2 +check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 # remove by tag a pv without mda vgreduce $vg3 @V3D8 -check pv_field $dev6 vg_name $vg3 -check pv_field $dev7 vg_name $vg3 -not check pv_field $dev8 vg_name $vg3 -check pv_field $dev9 vg_name $vg3 -check pv_field $dev2 vg_name $vg2 -check pv_field $dev3 vg_name $vg2 -check pv_field $dev4 vg_name $vg2 -check pv_field $dev5 vg_name $vg2 +check pv_field "$dev6" vg_name $vg3 +check pv_field "$dev7" vg_name $vg3 +not check pv_field "$dev8" vg_name $vg3 +check pv_field "$dev9" vg_name $vg3 +check pv_field "$dev2" vg_name $vg2 +check pv_field "$dev3" vg_name $vg2 +check pv_field "$dev4" vg_name $vg2 +check pv_field "$dev5" vg_name $vg2 # reset -vgextend $vg3 $dev8 - - +vgextend $vg3 "$dev8" diff --git a/test/shell/process-each-pvresize.sh b/test/shell/process-each-pvresize.sh index caa0890..02fe081 100644 --- a/test/shell/process-each-pvresize.sh +++ b/test/shell/process-each-pvresize.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2013 Red Hat, Inc. All rights reserved. +# Copyright (C) 2008-2014 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 @@ -76,152 +76,152 @@ old_reduced="28.00m" new_request="20.00m" new_reduced="16.00m" -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # one pv -pvresize --setphysicalvolumesize $new_request $dev10 -check pv_field $dev10 pv_size $new_reduced +pvresize --setphysicalvolumesize $new_request "$dev10" +check pv_field "$dev10" pv_size $new_reduced # unchanged -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # two pvs in separate vgs -pvresize --setphysicalvolumesize $new_request $dev2 $dev6 -check pv_field $dev2 pv_size $new_reduced -check pv_field $dev6 pv_size $new_reduced +pvresize --setphysicalvolumesize $new_request "$dev2" "$dev6" +check pv_field "$dev2" pv_size $new_reduced +check pv_field "$dev6" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # one tag on one pv pvresize --setphysicalvolumesize $new_request @V2D4 -check pv_field $dev4 pv_size $new_reduced +check pv_field "$dev4" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # one tag on all pvs in one vg pvresize --setphysicalvolumesize $new_request @V3 -check pv_field $dev6 pv_size $new_reduced -check pv_field $dev7 pv_size $new_reduced -check pv_field $dev8 pv_size $new_reduced -check pv_field $dev9 pv_size $new_reduced +check pv_field "$dev6" pv_size $new_reduced +check pv_field "$dev7" pv_size $new_reduced +check pv_field "$dev8" pv_size $new_reduced +check pv_field "$dev9" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # one tag on some pvs in one vg pvresize --setphysicalvolumesize $new_request @V2D45 -check pv_field $dev4 pv_size $new_reduced -check pv_field $dev5 pv_size $new_reduced +check pv_field "$dev4" pv_size $new_reduced +check pv_field "$dev5" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # one tag on multiple pvs in separate vgs pvchange --addtag V12 "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" pvresize --setphysicalvolumesize $new_request @V12 -check pv_field $dev10 pv_size $new_reduced -check pv_field $dev2 pv_size $new_reduced -check pv_field $dev3 pv_size $new_reduced -check pv_field $dev4 pv_size $new_reduced -check pv_field $dev5 pv_size $new_reduced +check pv_field "$dev10" pv_size $new_reduced +check pv_field "$dev2" pv_size $new_reduced +check pv_field "$dev3" pv_size $new_reduced +check pv_field "$dev4" pv_size $new_reduced +check pv_field "$dev5" pv_size $new_reduced # unchanged -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # one pv and one tag on different pv -pvresize --setphysicalvolumesize $new_request $dev10 @V3D9 -check pv_field $dev10 pv_size $new_reduced -check pv_field $dev9 pv_size $new_reduced +pvresize --setphysicalvolumesize $new_request "$dev10" @V3D9 +check pv_field "$dev10" pv_size $new_reduced +check pv_field "$dev9" pv_size $new_reduced # unchanged -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # redundant pv and tag -pvresize --setphysicalvolumesize $new_request $dev9 @V3D9 -check pv_field $dev9 pv_size $new_reduced +pvresize --setphysicalvolumesize $new_request "$dev9" @V3D9 +check pv_field "$dev9" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # two tags on pvs in separate vgs pvresize --setphysicalvolumesize $new_request @V3D9 @V2D3 -check pv_field $dev9 pv_size $new_reduced -check pv_field $dev3 pv_size $new_reduced +check pv_field "$dev9" pv_size $new_reduced +check pv_field "$dev3" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" # @@ -235,91 +235,91 @@ new_request="20.00m" new_reduced="16.00m" new_orphan="20.00m" -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # one orphan -pvresize --setphysicalvolumesize $new_request $dev11 -check pv_field $dev11 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request "$dev11" +check pv_field "$dev11" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev14" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # two orphans -pvresize --setphysicalvolumesize $new_request $dev11 $dev14 -check pv_field $dev11 pv_size $new_orphan -check pv_field $dev14 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request "$dev11" "$dev14" +check pv_field "$dev11" pv_size $new_orphan +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one orphan, one tag -pvresize --setphysicalvolumesize $new_request @V3D9 $dev14 -check pv_field $dev9 pv_size $new_reduced -check pv_field $dev14 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request @V3D9 "$dev14" +check pv_field "$dev9" pv_size $new_reduced +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one pv, one orphan, one tag -pvresize --setphysicalvolumesize $new_request @V3D9 $dev14 $dev10 -check pv_field $dev9 pv_size $new_reduced -check pv_field $dev10 pv_size $new_reduced -check pv_field $dev14 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request @V3D9 "$dev14" "$dev10" +check pv_field "$dev9" pv_size $new_reduced +check pv_field "$dev10" pv_size $new_reduced +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # @@ -327,235 +327,234 @@ pvresize --setphysicalvolumesize $old_request $dev11 $dev14 # # one dev (non-pv) -not pvresize --setphysicalvolumesize $new_request $dev13 +not pvresize --setphysicalvolumesize $new_request "$dev13" # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # one orphan and one dev (non-pv) -not pvresize --setphysicalvolumesize $new_request $dev14 $dev13 -check pv_field $dev14 pv_size $new_orphan +not pvresize --setphysicalvolumesize $new_request "$dev14" "$dev13" +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one pv and one dev (non-pv) -not pvresize --setphysicalvolumesize $new_request $dev9 $dev13 -check pv_field $dev9 pv_size $new_reduced +not pvresize --setphysicalvolumesize $new_request "$dev9" "$dev13" +check pv_field "$dev9" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one tag and one dev (non-pv) -not pvresize --setphysicalvolumesize $new_request @V3D9 $dev13 -check pv_field $dev9 pv_size $new_reduced +not pvresize --setphysicalvolumesize $new_request @V3D9 "$dev13" +check pv_field "$dev9" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one pv, one orphan, one tag, one dev -not pvresize --setphysicalvolumesize $new_request @V3D9 $dev13 $dev14 $dev10 -check pv_field $dev9 pv_size $new_reduced -check pv_field $dev10 pv_size $new_reduced -check pv_field $dev14 pv_size $new_orphan +not pvresize --setphysicalvolumesize $new_request @V3D9 "$dev13" "$dev14" "$dev10" +check pv_field "$dev9" pv_size $new_reduced +check pv_field "$dev10" pv_size $new_reduced +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # # pvresize including pvs without mdas # -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # one pv without mda -pvresize --setphysicalvolumesize $new_request $dev2 -check pv_field $dev2 pv_size $new_reduced +pvresize --setphysicalvolumesize $new_request "$dev2" +check pv_field "$dev2" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # two pvs without mdas -pvresize --setphysicalvolumesize $new_request $dev6 $dev7 -check pv_field $dev6 pv_size $new_reduced -check pv_field $dev7 pv_size $new_reduced +pvresize --setphysicalvolumesize $new_request "$dev6" "$dev7" +check pv_field "$dev6" pv_size $new_reduced +check pv_field "$dev7" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one pv with mda and one pv without mda -pvresize --setphysicalvolumesize $new_request $dev8 $dev9 -check pv_field $dev8 pv_size $new_reduced -check pv_field $dev9 pv_size $new_reduced +pvresize --setphysicalvolumesize $new_request "$dev8" "$dev9" +check pv_field "$dev8" pv_size $new_reduced +check pv_field "$dev9" pv_size $new_reduced # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan +check pv_field "$dev14" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one orphan with mda -pvresize --setphysicalvolumesize $new_request $dev11 -check pv_field $dev11 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request "$dev11" +check pv_field "$dev11" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev14 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev14" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one orphan without mda -pvresize --setphysicalvolumesize $new_request $dev14 -check pv_field $dev14 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request "$dev14" +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced -check pv_field $dev11 pv_size $old_orphan +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced +check pv_field "$dev11" pv_size $old_orphan # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one orphan with mda and one orphan without mda -pvresize --setphysicalvolumesize $new_request $dev14 $dev11 -check pv_field $dev11 pv_size $new_orphan -check pv_field $dev14 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request "$dev14" "$dev11" +check pv_field "$dev11" pv_size $new_orphan +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced -check pv_field $dev8 pv_size $old_reduced -check pv_field $dev9 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced +check pv_field "$dev8" pv_size $old_reduced +check pv_field "$dev9" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" # one pv with mda and one pv without mda, and # one orphan with mda and one orphan without mda -pvresize --setphysicalvolumesize $new_request $dev8 $dev9 $dev14 $dev11 -check pv_field $dev8 pv_size $new_reduced -check pv_field $dev9 pv_size $new_reduced -check pv_field $dev11 pv_size $new_orphan -check pv_field $dev14 pv_size $new_orphan +pvresize --setphysicalvolumesize $new_request "$dev8" "$dev9" "$dev14" "$dev11" +check pv_field "$dev8" pv_size $new_reduced +check pv_field "$dev9" pv_size $new_reduced +check pv_field "$dev11" pv_size $new_orphan +check pv_field "$dev14" pv_size $new_orphan # unchanged -check pv_field $dev10 pv_size $old_reduced -check pv_field $dev2 pv_size $old_reduced -check pv_field $dev3 pv_size $old_reduced -check pv_field $dev4 pv_size $old_reduced -check pv_field $dev5 pv_size $old_reduced -check pv_field $dev6 pv_size $old_reduced -check pv_field $dev7 pv_size $old_reduced +check pv_field "$dev10" pv_size $old_reduced +check pv_field "$dev2" pv_size $old_reduced +check pv_field "$dev3" pv_size $old_reduced +check pv_field "$dev4" pv_size $old_reduced +check pv_field "$dev5" pv_size $old_reduced +check pv_field "$dev6" pv_size $old_reduced +check pv_field "$dev7" pv_size $old_reduced # reset back to old size -pvresize --setphysicalvolumesize $old_request $dev10 $dev2 $dev3 $dev4 $dev5 $dev6 $dev7 $dev8 $dev9 -pvresize --setphysicalvolumesize $old_request $dev11 $dev14 - +pvresize --setphysicalvolumesize $old_request "$dev10" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6" "$dev7" "$dev8" "$dev9" +pvresize --setphysicalvolumesize $old_request "$dev11" "$dev14" diff --git a/test/shell/pvchange-usage.sh b/test/shell/pvchange-usage.sh index 72ab16b..e5695b6 100644 --- a/test/shell/pvchange-usage.sh +++ b/test/shell/pvchange-usage.sh @@ -20,7 +20,7 @@ check_changed_uuid_() { aux prepare_pvs 4 # check 'allocatable' pv attribute -pvcreate $dev1 +pvcreate "$dev1" check pv_field "$dev1" pv_attr --- vgcreate $vg1 "$dev1" check pv_field "$dev1" pv_attr a-- diff --git a/test/shell/pvcreate-bootloaderarea.sh b/test/shell/pvcreate-bootloaderarea.sh index 42349e4..53a9839 100644 --- a/test/shell/pvcreate-bootloaderarea.sh +++ b/test/shell/pvcreate-bootloaderarea.sh @@ -27,7 +27,7 @@ check pv_field "$dev1" ba_size "786432" check pv_field "$dev1" pe_start "1048576" #COMM 'pvcreate with booloader area size - test corner cases' -dev_size=$(pvs -o pv_size --noheadings $dev1) +dev_size=$(pvs -o pv_size --noheadings "$dev1") pv_size=$[dev_size - 1048576] # device size - 1m pe_start = area for data # try to use the whole data area for bootloader area, remaining data area is zero then (pe_start = pv_size) diff --git a/test/shell/pvmove-background.sh b/test/shell/pvmove-background.sh index 8f59301..590c77b 100644 --- a/test/shell/pvmove-background.sh +++ b/test/shell/pvmove-background.sh @@ -19,7 +19,7 @@ for mode in "--atomic" "" do lvcreate -aey -l1 -n $lv1 $vg "$dev1" -lvs -o +devices | grep $dev1 +lvs -o +devices | grep "$dev1" pvmove $mode -i 1 -b "$dev1" "$dev2" sleep 5 # arbitrary... lvs -o +devices | not grep "pvmove" diff --git a/test/shell/report-select.sh b/test/shell/report-select.sh index fb12bd6..11a4efd 100644 --- a/test/shell/report-select.sh +++ b/test/shell/report-select.sh @@ -19,13 +19,13 @@ aux prepare_pvs 6 16 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # create $VGS with assorted tags -vgcreate $vg1 --vgmetadatacopies 2 --addtag "vg_tag3" --addtag "vg_tag2" -s 4m $dev1 $dev2 $dev3 -vgcreate $vg2 --addtag "vg_tag2" -s 4m $dev4 $dev5 -vgcreate $vg3 --addtag "vg_tag1" -s 4m $dev6 +vgcreate $vg1 --vgmetadatacopies 2 --addtag "vg_tag3" --addtag "vg_tag2" -s 4m "$dev1" "$dev2" "$dev3" +vgcreate $vg2 --addtag "vg_tag2" -s 4m "$dev4" "$dev5" +vgcreate $vg3 --addtag "vg_tag1" -s 4m "$dev6" # add PV assorted tags -pvchange --addtag "pv_tag3" --addtag "pv_tag1" --addtag "pv_tag2" $dev1 -pvchange --addtag "pv_tag1" --addtag "pv_tag4" $dev6 +pvchange --addtag "pv_tag3" --addtag "pv_tag1" --addtag "pv_tag2" "$dev1" +pvchange --addtag "pv_tag1" --addtag "pv_tag4" "$dev6" # create $LVS with assorted tags and various sizes lvcreate --addtag 'lv_tag2.-+/=!:&#' --addtag "lv_tag1" -L8m -n "vol1" $vg1

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits October 2014