May 2014 - lvm2-commits - Fedora mailing-lists

master - test: use direct I/O when injecting bad data into RAID images
by Jonathan Brassow 30 May '14

30 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4454a580dfd966d0… Commit: 4454a580dfd966d0cd132a2fd7d0cbb0df7e46a6 Parent: 03621692774e33357acc11ad23d4c8d1faffe971 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Fri May 30 17:26:10 2014 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Fri May 30 17:26:10 2014 -0500 test: use direct I/O when injecting bad data into RAID images When directly corrupting RAID images for the purpose of testing, we must use direct I/O (or a 'sync' after the 'dd') to ensure that the writes are not caught in the buffer cache in a way that is not reachable by the top-level RAID device. --- test/shell/lvchange-syncaction-raid.sh | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/test/shell/lvchange-syncaction-raid.sh b/test/shell/lvchange-syncaction-raid.sh index a27b885..b5fdfb4 100644 --- a/test/shell/lvchange-syncaction-raid.sh +++ b/test/shell/lvchange-syncaction-raid.sh @@ -13,7 +13,10 @@ . lib/test -aux have_raid 1 5 0 || skip +# Proper mismatch count 1.5.2+ upstream, 1.3.5 < x < 1.4.0 in RHEL6 +aux have_raid 1 3 5 && + ! aux have_raid 1 4 0 || + aux have_raid 1 5 2 || skip aux prepare_vg 3 lvcreate -n $lv1 $vg -l1 --type raid1 @@ -22,16 +25,7 @@ START=$(get pv_field "$dev2" pe_start --units 1k) METASIZE=$(get lv_field $vg/${lv1}_rmeta_1 size -a --units 1k) SEEK=$((${START%\.00k} + ${METASIZE%\.00k})) # Overwrite some portion of _rimage_1 -dd if=/dev/urandom of="$dev2" bs=1K count=1 seek=$SEEK - -lvchange --syncaction check $vg/$lv1 - -# hmmm it's still in 'dd' buffer and not on real disk ?? -# anyway skip over with 'should' -should check lv_field $vg/$lv1 raid_mismatch_count "128" - -# Ensure it's all on disk now -sync +dd if=/dev/urandom of="$dev2" bs=1K count=1 seek=$SEEK oflag=direct lvchange --syncaction check $vg/$lv1 check lv_field $vg/$lv1 raid_mismatch_count "128"

1 0

master - report: fix report field type for lv_kernel_major/minor
by Peter Rajnoha 30 May '14

30 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=03621692774e3335… Commit: 03621692774e33357acc11ad23d4c8d1faffe971 Parent: 442820aae3648e1846417d1248fa36030eba4bd8 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri May 30 17:23:54 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri May 30 17:24:07 2014 +0200 report: fix report field type for lv_kernel_major/minor Should be defined as numeric field, not string field. --- lib/report/columns.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/report/columns.h b/lib/report/columns.h index 93b5575..7c36d10 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -36,8 +36,8 @@ FIELD(LVS, lv, STR, "Active", lvid, 6, lvactive, lv_active, "Active state of the FIELD(LVS, lv, NUM, "Maj", major, 3, int32, lv_major, "Persistent major number or -1 if not persistent.", 0) FIELD(LVS, lv, NUM, "Min", minor, 3, int32, lv_minor, "Persistent minor number or -1 if not persistent.", 0) FIELD(LVS, lv, NUM, "Rahead", lvid, 6, lvreadahead, lv_read_ahead, "Read ahead setting in current units.", 0) -FIELD(LVS, lv, STR, "KMaj", lvid, 4, lvkmaj, lv_kernel_major, "Currently assigned major number or -1 if LV is not active.", 0) -FIELD(LVS, lv, STR, "KMin", lvid, 4, lvkmin, lv_kernel_minor, "Currently assigned minor number or -1 if LV is not active.", 0) +FIELD(LVS, lv, NUM, "KMaj", lvid, 4, lvkmaj, lv_kernel_major, "Currently assigned major number or -1 if LV is not active.", 0) +FIELD(LVS, lv, NUM, "KMin", lvid, 4, lvkmin, lv_kernel_minor, "Currently assigned minor number or -1 if LV is not active.", 0) FIELD(LVS, lv, NUM, "KRahead", lvid, 7, lvkreadahead, lv_kernel_read_ahead, "Currently-in-use read ahead setting in current units.", 0) FIELD(LVS, lv, NUM, "LSize", size, 5, size64, lv_size, "Size of LV in current units.", 0) FIELD(LVS, lv, NUM, "MSize", lvid, 6, lvmetadatasize, lv_metadata_size, "For thin pools, the size of the LV that holds the metadata.", 0)

1 0

master - activation: Remove empty DM device when table fails to load.
by Jonathan Brassow 28 May '14

28 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=442820aae3648e18… Commit: 442820aae3648e1846417d1248fa36030eba4bd8 Parent: 8212dac849e5a820c579c06a1b2805e7934a8d8b Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Wed May 28 10:17:15 2014 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Wed May 28 10:17:15 2014 -0500 activation: Remove empty DM device when table fails to load. As part of better error handling, remove DM devices that have been sucessfully created but failed to load a table. This can happen when pvmove'ing in a cluster and the cluster mirror daemon is not running on a remote node - the mapping table failing to load as a result. In this case, any revert would work on other nodes running cmirrord because the DM devices on those nodes did succeed in loading. However, because no table was able to load on the non-cmirrord nodes, there is no table present that points to what needs to be reverted. This causes the empty DM device to remain on the system without being present in any LVM representation. This patch should only be considered a partial fix to the overall problem. This is because only the device which failed to load a table is removed. Any LVs that may have been loaded as requirements to the DM device that failed to load may be left in place. Complete clean-up will require tracking those devices which have been created as dependencies and removing them along with the device that failed to load a table. --- libdm/libdm-deptree.c | 59 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 6 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 0a53755..f34c40f 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1920,15 +1920,50 @@ static int _create_node(struct dm_tree_node *dnode) if (!dm_task_no_open_count(dmt)) log_error("Failed to disable open_count"); - if ((r = dm_task_run(dmt))) - r = dm_task_get_info(dmt, &dnode->info); - + if ((r = dm_task_run(dmt))) { + if (!(r = dm_task_get_info(dmt, &dnode->info))) + /* + * This should not be possible to occur. However, + * we print an error message anyway for the more + * absurd cases (e.g. memory corruption) so there + * is never any question as to which one failed. + */ + log_error(INTERNAL_ERROR + "Unable to get DM task info for %s.", + dnode->name); + } out: dm_task_destroy(dmt); return r; } +/* + * _remove_node + * + * This function is only used to remove a DM device that has failed + * to load any table. + */ +static int _remove_node(struct dm_tree_node *dnode) +{ + if (!dnode->info.exists) + return 1; + + if (dnode->info.live_table || dnode->info.inactive_table) { + log_error(INTERNAL_ERROR + "_remove_node called on device with loaded table(s)."); + return 0; + } + + if (!_deactivate_node(dnode->name, dnode->info.major, dnode->info.minor, + &dnode->dtree->cookie, dnode->udev_flags, 0)) { + log_error("Failed to clean-up device with no table: %s %u:%u", + dnode->name ? dnode->name : "", + dnode->info.major, dnode->info.minor); + return 0; + } + return 1; +} static int _build_dev_string(char *devbuf, size_t bufsize, struct dm_tree_node *node) { @@ -2662,7 +2697,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, const char *uuid_prefix, size_t uuid_prefix_len) { - int r = 1; + int r = 1, node_created = 0; void *handle = NULL; struct dm_tree_node *child; struct dm_info newinfo; @@ -2684,13 +2719,25 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, return_0; /* FIXME Cope if name exists with no uuid? */ - if (!child->info.exists && !_create_node(child)) + if (!child->info.exists && !(node_created = _create_node(child))) return_0; if (!child->info.inactive_table && child->props.segment_count && - !_load_node(child)) + !_load_node(child)) { + /* + * If the table load does not succeed, we remove the + * device in the kernel that would otherwise have an + * empty table. This makes the create + load of the + * device atomic. However, if other dependencies have + * already been created and loaded; this code is + * insufficient to remove those - only the node + * encountering the table load failure is removed. + */ + if (node_created && !_remove_node(child)) + return_0; return_0; + } /* Propagate device size change change */ if (child->props.size_changed)

1 0

master - tests: rename test
by Zdenek Kabelac 28 May '14

28 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8212dac849e5a820… Commit: 8212dac849e5a820c579c06a1b2805e7934a8d8b Parent: 2adaef82722ec71620a6d02c6c973d3472d705ae Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 28 15:41:06 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 28 15:41:06 2014 +0200 tests: rename test --- test/shell/lvmetad-same-uuid.sh | 27 --------------------------- test/shell/pv-duplicate-uuid.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/test/shell/lvmetad-same-uuid.sh b/test/shell/lvmetad-same-uuid.sh deleted file mode 100644 index 34cc8eb..0000000 --- a/test/shell/lvmetad-same-uuid.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# 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 -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -. lib/test - -aux prepare_devs 3 - -pvcreate "$dev1" -UUID1=$(get pv_field "$dev1" uuid) -pvcreate --config "devices{filter=[\"a|$dev2|\",\"r|.*|\"]}" -u "$UUID1" --norestorefile "$dev2" -pvcreate --config "devices{filter=[\"a|$dev3|\",\"r|.*|\"]}" -u "$UUID1" --norestorefile "$dev3" - -pvs -o+uuid |& tee out -COUNT=$(should grep --count "Found duplicate" out) - -# FIXME lvmetad is not able to serve properly this case -should [ "$COUNT" -eq 2 ] - -pvs -o+uuid --config "devices{filter=[\"a|$dev2|\",\"r|.*|\"]}" diff --git a/test/shell/pv-duplicate-uuid.sh b/test/shell/pv-duplicate-uuid.sh new file mode 100644 index 0000000..cc5f56b --- /dev/null +++ b/test/shell/pv-duplicate-uuid.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# 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 +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# Test 'Found duplicate' is shown +. lib/test + +aux prepare_devs 3 + +pvcreate "$dev1" +UUID1=$(get pv_field "$dev1" uuid) +pvcreate --config "devices{filter=[\"a|$dev2|\",\"r|.*|\"]}" -u "$UUID1" --norestorefile "$dev2" +pvcreate --config "devices{filter=[\"a|$dev3|\",\"r|.*|\"]}" -u "$UUID1" --norestorefile "$dev3" + +pvs -o+uuid |& tee out +COUNT=$(should grep --count "Found duplicate" out) + +# FIXME lvmetad is not able to serve properly this case +should [ "$COUNT" -eq 2 ] + +pvs -o+uuid --config "devices{filter=[\"a|$dev2|\",\"r|.*|\"]}"

1 0

master - revert: restore original timeout
by Zdenek Kabelac 28 May '14

28 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2adaef82722ec716… Commit: 2adaef82722ec71620a6d02c6c973d3472d705ae Parent: 171a668e81d9c647677465f042775722a35c5a6e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 28 15:27:14 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 28 15:33:41 2014 +0200 revert: restore original timeout Accidently it's been commited - but it has also shown, that on heavy loaded systems (like our test machine could be) slightly bigger timeouts which waits longer for udev rules processing does help and avoids occasional refuse of deactivation because device is still being open. (i.e. lvcreate...; lvchange -an...) Unsure how we could now synchronize for this. On very slow(/loaded) system 5 second timeout is simply not enough. TODO: introduce at least lvm.conf configurable setting to allow longer 'retry' loops. --- lib/activate/activate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 7ad3654..41d74c7 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -726,7 +726,7 @@ int lv_check_not_in_use(struct cmd_context *cmd, struct logical_volume *lv, return 0; } - usleep(OPEN_COUNT_CHECK_USLEEP_DELAY * 4); + usleep(OPEN_COUNT_CHECK_USLEEP_DELAY); log_debug_activation("Retrying open_count check for %s/%s.", lv->vg->name, lv->name); if (!lv_info(cmd, lv, 0, info, 1, 0)) {

1 0

master - tests: dd needs to hit disk
by Zdenek Kabelac 28 May '14

28 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=171a668e81d9c647… Commit: 171a668e81d9c647677465f042775722a35c5a6e Parent: ba3e6e7c323a48b64720f7a182d5c8eca0a5613c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 28 15:24:41 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 28 15:33:41 2014 +0200 tests: dd needs to hit disk Unsure if this is feature or bug of syncaction, but it needs to be present physically on the media and it ignores content of buffer cache... (maybe lvchange should implicitely fsync all disks that are members of raid array before starting test??) --- test/shell/lvchange-raid.sh | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh index 209e094..a229154 100644 --- a/test/shell/lvchange-raid.sh +++ b/test/shell/lvchange-raid.sh @@ -157,22 +157,7 @@ run_syncaction_check() { # Overwrite the last half of one of the PVs with crap dd if=/dev/urandom of="$device" bs=1k count=$size seek=$seek - - if [ -n "$THIN_POSTFIX" ]; then - # - # Seems to work fine on real devices, - # but can't make the system notice the bad blocks - # in the testsuite - especially when thin is layered - # on top of RAID. In other cases, I can deactivate - # and reactivate and it works. Here, even that doesn't - # work. - return 0 - lvchange -an $vg/$2 - lvchange -ay $vg/$2 - else - lvchange -an $vg/$lv - lvchange -ay $vg/$lv - fi + sync # "check" should find discrepancies but not change them # 'lvs' should show results

1 0

master - tests: raid syncaction activation race
by Zdenek Kabelac 28 May '14

28 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ba3e6e7c323a48b6… Commit: ba3e6e7c323a48b64720f7a182d5c8eca0a5613c Parent: a67774c1fa315e248504a51804cef9f9bc709b2e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 28 15:23:46 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 28 15:33:41 2014 +0200 tests: raid syncaction activation race Demonstrace problem of syncaction being called right after activation. --- test/shell/lvchange-syncaction-raid.sh | 63 ++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/test/shell/lvchange-syncaction-raid.sh b/test/shell/lvchange-syncaction-raid.sh new file mode 100644 index 0000000..a27b885 --- /dev/null +++ b/test/shell/lvchange-syncaction-raid.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# 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 +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# test activation race for raid's --syncaction check + +. lib/test + +aux have_raid 1 5 0 || skip +aux prepare_vg 3 + +lvcreate -n $lv1 $vg -l1 --type raid1 + +START=$(get pv_field "$dev2" pe_start --units 1k) +METASIZE=$(get lv_field $vg/${lv1}_rmeta_1 size -a --units 1k) +SEEK=$((${START%\.00k} + ${METASIZE%\.00k})) +# Overwrite some portion of _rimage_1 +dd if=/dev/urandom of="$dev2" bs=1K count=1 seek=$SEEK + +lvchange --syncaction check $vg/$lv1 + +# hmmm it's still in 'dd' buffer and not on real disk ?? +# anyway skip over with 'should' +should check lv_field $vg/$lv1 raid_mismatch_count "128" + +# Ensure it's all on disk now +sync + +lvchange --syncaction check $vg/$lv1 +check lv_field $vg/$lv1 raid_mismatch_count "128" + +# Let's deactivate +lvchange -an $vg/$lv1 + +# Slow down write by 100ms +aux delay_dev "$dev2" 0 100 +lvchange -ay $vg/$lv1 +# noone has it open and target is read & running +dmsetup info -c + +#sleep 10 < "$DM_DEV_DIR/$vg/$lv1" & +# "check" should find discrepancies but not change them +# 'lvs' should show results + +# FIXME +# this looks like some race with 'write' during activation +# and syncaction... +# For now it fails with: +# device-mapper: message ioctl on failed: Device or resource busy +# +lvchange --syncaction check $vg/$lv1 + +aux enable_dev "$dev2" +lvs -o+raid_mismatch_count -a $vg + +vgremove -ff $vg

1 0

master - tests: detect same uuid on PV
by Zdenek Kabelac 27 May '14

27 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a67774c1fa315e24… Commit: a67774c1fa315e248504a51804cef9f9bc709b2e Parent: 9240aca369e210dddb3435433a3c9ac4fe35d357 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 27 16:51:57 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 27 17:09:05 2014 +0200 tests: detect same uuid on PV Check we know how to handle same UUID Test currently does NOT work on lvmetad (or it's unclear it even should - thus test error is currently lowered to 'test warning') TODO: replace lib/test with a better shell script name --- test/shell/lvmetad-same-uuid.sh | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/test/shell/lvmetad-same-uuid.sh b/test/shell/lvmetad-same-uuid.sh new file mode 100644 index 0000000..34cc8eb --- /dev/null +++ b/test/shell/lvmetad-same-uuid.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# 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 +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +. lib/test + +aux prepare_devs 3 + +pvcreate "$dev1" +UUID1=$(get pv_field "$dev1" uuid) +pvcreate --config "devices{filter=[\"a|$dev2|\",\"r|.*|\"]}" -u "$UUID1" --norestorefile "$dev2" +pvcreate --config "devices{filter=[\"a|$dev3|\",\"r|.*|\"]}" -u "$UUID1" --norestorefile "$dev3" + +pvs -o+uuid |& tee out +COUNT=$(should grep --count "Found duplicate" out) + +# FIXME lvmetad is not able to serve properly this case +should [ "$COUNT" -eq 2 ] + +pvs -o+uuid --config "devices{filter=[\"a|$dev2|\",\"r|.*|\"]}"

1 0

master - raid: cleanup error messages
by Zdenek Kabelac 27 May '14

27 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9240aca369e210dd… Commit: 9240aca369e210dddb3435433a3c9ac4fe35d357 Parent: ae43d1afa205c53e0068cb23b386594e16bbb6a2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 27 16:56:33 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 27 17:08:49 2014 +0200 raid: cleanup error messages Add log_error messages on error paths. --- lib/metadata/raid_manip.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index f1cb012..ac0f948 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -544,16 +544,10 @@ static int _raid_add_images(struct logical_volume *lv, log_error("Unable to add RAID images to %s of segment type %s", lv->name, seg->segtype->ops->name(seg)); return 0; - } else if (!_raid_in_sync(lv)) { - log_error("Unable to add RAID images until %s is in-sync", - lv->name); - return 0; } - if (!_alloc_image_components(lv, pvs, count, &meta_lvs, &data_lvs)) { - log_error("Failed to allocate new image components"); - return 0; - } + if (!_alloc_image_components(lv, pvs, count, &meta_lvs, &data_lvs)) + return_0; /* * If linear, we must correct data LV names. They are off-by-one @@ -570,7 +564,7 @@ static int _raid_add_images(struct logical_volume *lv, dm_list_iterate(l, &data_lvs) { if (l == dm_list_last(&data_lvs)) { lvl = dm_list_item(l, struct lv_list); - len = strlen(lv->name) + strlen("_rimage_XXX"); + len = strlen(lv->name) + sizeof("_rimage_XXX"); if (!(name = dm_pool_alloc(lv->vg->vgmem, len))) { log_error("Failed to allocate rimage name."); return 0; @@ -607,8 +601,7 @@ static int _raid_add_images(struct logical_volume *lv, log_very_verbose("Setting RAID1 region_size to %uS", seg->region_size); } - seg->segtype = get_segtype_from_string(lv->vg->cmd, "raid1"); - if (!seg->segtype) + if (!(seg->segtype = get_segtype_from_string(lv->vg->cmd, "raid1"))) return_0; } /* @@ -624,15 +617,19 @@ to be left for these sub-lvs. */ /* Expand areas array */ if (!(new_areas = dm_pool_zalloc(lv->vg->cmd->mem, - new_count * sizeof(*new_areas)))) + new_count * sizeof(*new_areas)))) { + log_error("Allocation of new areas failed."); goto fail; + } memcpy(new_areas, seg->areas, seg->area_count * sizeof(*seg->areas)); seg->areas = new_areas; /* Expand meta_areas array */ if (!(new_areas = dm_pool_zalloc(lv->vg->cmd->mem, - new_count * sizeof(*new_areas)))) + new_count * sizeof(*new_areas)))) { + log_error("Allocation of new meta areas failed."); goto fail; + } if (seg->meta_areas) memcpy(new_areas, seg->meta_areas, seg->area_count * sizeof(*seg->meta_areas)); @@ -738,7 +735,7 @@ fail: dm_list_iterate_items(lvl, &data_lvs) if (!lv_remove(lvl->lv)) return_0; - return_0; + return 0; } /*

1 0

master - activate: cleanup lv_check_not_in_use
by Zdenek Kabelac 27 May '14

27 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ae43d1afa205c53e… Commit: ae43d1afa205c53e0068cb23b386594e16bbb6a2 Parent: 1569e7a4985776783fa0175ddfa6dd333a68b981 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 27 17:07:04 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 27 17:08:49 2014 +0200 activate: cleanup lv_check_not_in_use Reindent lv_check_not_in_use to simplify internal loop code. Also return always '0/1' (drop -1) - since we only check for failure (0) - and we don't really know why lv_info() has failed. --- lib/activate/activate.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 6a9dd0a..7ad3654 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -719,21 +719,20 @@ int lv_check_not_in_use(struct cmd_context *cmd, struct logical_volume *lv, } open_count_check_retries = retry_deactivation() ? OPEN_COUNT_CHECK_RETRIES : 1; - while (open_count_check_retries--) { - if (info->open_count > 0) { - if (open_count_check_retries) { - usleep(OPEN_COUNT_CHECK_USLEEP_DELAY); - log_debug_activation("Retrying open_count check for %s/%s.", - lv->vg->name, lv->name); - if (!lv_info(cmd, lv, 0, info, 1, 0)) - return -1; - continue; - } + while (info->open_count > 0 && open_count_check_retries--) { + if (!open_count_check_retries) { log_error("Logical volume %s/%s in use.", lv->vg->name, lv->name); return 0; - } else + } + + usleep(OPEN_COUNT_CHECK_USLEEP_DELAY * 4); + log_debug_activation("Retrying open_count check for %s/%s.", + lv->vg->name, lv->name); + if (!lv_info(cmd, lv, 0, info, 1, 0)) { + stack; /* device dissappeared? */ break; + } } return 1;

1 0

master - udev: also print subsystem udev flags in debug message about udev flags + fix typo DM_SUBSSYTEM_UDEV_FLAG7 -> DM_SUBSYSTEM_UDEV_FLAG7
by Peter Rajnoha 27 May '14

27 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1569e7a498577678… Commit: 1569e7a4985776783fa0175ddfa6dd333a68b981 Parent: b3539907f582a924df1c056829a231d1d39e4cec Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue May 27 14:44:11 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue May 27 14:44:11 2014 +0200 udev: also print subsystem udev flags in debug message about udev flags + fix typo DM_SUBSSYTEM_UDEV_FLAG7 -> DM_SUBSYSTEM_UDEV_FLAG7 --- libdm/libdevmapper.h | 2 +- libdm/libdm-common.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 990692c..386ef07 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1877,7 +1877,7 @@ struct dm_pool *dm_config_memory(struct dm_config_tree *cft); #define DM_SUBSYSTEM_UDEV_FLAG4 0x1000 #define DM_SUBSYSTEM_UDEV_FLAG5 0x2000 #define DM_SUBSYSTEM_UDEV_FLAG6 0x4000 -#define DM_SUBSSYTEM_UDEV_FLAG7 0x8000 +#define DM_SUBSYSTEM_UDEV_FLAG7 0x8000 int dm_cookie_supported(void); diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index bb793e3..ea5b97e 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -2426,7 +2426,8 @@ int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) dmt->cookie_set = 1; log_debug_activation("Udev cookie 0x%" PRIx32 " (semid %d) assigned to " - "%s task(%d) with flags%s%s%s%s%s%s%s (0x%" PRIx16 ")", *cookie, semid, _task_type_disp(dmt->type), dmt->type, + "%s task(%d) with flags%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s (0x%" PRIx16 ")", + *cookie, semid, _task_type_disp(dmt->type), dmt->type, (flags & DM_UDEV_DISABLE_DM_RULES_FLAG) ? " DISABLE_DM_RULES" : "", (flags & DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG) ? " DISABLE_SUBSYSTEM_RULES" : "", (flags & DM_UDEV_DISABLE_DISK_RULES_FLAG) ? " DISABLE_DISK_RULES" : "", @@ -2434,6 +2435,14 @@ int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) (flags & DM_UDEV_LOW_PRIORITY_FLAG) ? " LOW_PRIORITY" : "", (flags & DM_UDEV_DISABLE_LIBRARY_FALLBACK) ? " DISABLE_LIBRARY_FALLBACK" : "", (flags & DM_UDEV_PRIMARY_SOURCE_FLAG) ? " PRIMARY_SOURCE" : "", + (flags & DM_SUBSYSTEM_UDEV_FLAG0) ? " SUBSYSTEM_0" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG1) ? " SUBSYSTEM_1" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG2) ? " SUBSYSTEM_2" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG3) ? " SUBSYSTEM_3" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG4) ? " SUBSYSTEM_4" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG5) ? " SUBSYSTEM_5" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG6) ? " SUBSYSTEM_6" : " ", + (flags & DM_SUBSYSTEM_UDEV_FLAG7) ? " SUBSYSTEM_7" : " ", flags); return 1;

1 0

master - tests: support thin_restore configurable
by Zdenek Kabelac 26 May '14

26 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b3539907f582a924… Commit: b3539907f582a924df1c056829a231d1d39e4cec Parent: b0ff3359f268913dbe01179600aa69c008cbb1ec Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 26 23:28:03 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 26 23:30:09 2014 +0200 tests: support thin_restore configurable Currently this tool is used only in tests. --- configure | 126 +++++++++++++++++++++++++ configure.in | 17 ++++ lib/misc/configure.h.in | 3 + test/Makefile.in | 10 +- test/shell/lvextend-thin-metadata-dmeventd.sh | 7 +- 5 files changed, 156 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 49a89c2..7738c8f 100755 --- a/configure +++ b/configure @@ -767,6 +767,7 @@ PKGCONFIGINIT_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +THIN_RESTORE_CMD THIN_REPAIR_CMD THIN_DUMP_CMD THIN_CHECK_CMD @@ -869,6 +870,7 @@ with_thin with_thin_check with_thin_dump with_thin_repair +with_thin_restore enable_thin_check_needs_check with_cache enable_readline @@ -1655,6 +1657,8 @@ Optional Packages: --with-thin-check=PATH thin_check tool: [[autodetect]] --with-thin-dump=PATH thin_dump tool: [[autodetect]] --with-thin-repair=PATH thin_repair tool: [[autodetect]] + --with-thin-restore=PATH + thin_restore tool: [[autodetect]] --with-cache=TYPE cache support: internal/shared/none [[TYPE=none]] --with-ocfdir=DIR install OCF files in DIR [[PREFIX/lib/ocf/resource.d/lvm2]] @@ -7197,6 +7201,14 @@ else fi +# Check whether --with-thin-restore was given. +if test "${with_thin_restore+set}" = set; then : + withval=$with_thin_restore; THIN_RESTORE_CMD=$withval +else + THIN_RESTORE_CMD="autodetect" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIN" >&5 $as_echo "$THIN" >&6; } @@ -7558,6 +7570,113 @@ $as_echo "$as_me: WARNING: thin_repair not found in path $PATH" >&2;} THIN_CONFIGURE_WARN=y } fi + # Empty means a config way to ignore thin checking + if test "$THIN_RESTORE_CMD" = "autodetect"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}thin_restore", so it can be a program name with args. +set dummy ${ac_tool_prefix}thin_restore; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_THIN_RESTORE_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $THIN_RESTORE_CMD in + [\\/]* | ?:[\\/]*) + ac_cv_path_THIN_RESTORE_CMD="$THIN_RESTORE_CMD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_THIN_RESTORE_CMD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +THIN_RESTORE_CMD=$ac_cv_path_THIN_RESTORE_CMD +if test -n "$THIN_RESTORE_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIN_RESTORE_CMD" >&5 +$as_echo "$THIN_RESTORE_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_THIN_RESTORE_CMD"; then + ac_pt_THIN_RESTORE_CMD=$THIN_RESTORE_CMD + # Extract the first word of "thin_restore", so it can be a program name with args. +set dummy thin_restore; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_THIN_RESTORE_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_THIN_RESTORE_CMD in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_THIN_RESTORE_CMD="$ac_pt_THIN_RESTORE_CMD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_THIN_RESTORE_CMD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_THIN_RESTORE_CMD=$ac_cv_path_ac_pt_THIN_RESTORE_CMD +if test -n "$ac_pt_THIN_RESTORE_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_THIN_RESTORE_CMD" >&5 +$as_echo "$ac_pt_THIN_RESTORE_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_THIN_RESTORE_CMD" = x; then + THIN_RESTORE_CMD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + THIN_RESTORE_CMD=$ac_pt_THIN_RESTORE_CMD + fi +else + THIN_RESTORE_CMD="$ac_cv_path_THIN_RESTORE_CMD" +fi + + test -z "$THIN_RESTORE_CMD" && { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: thin_restore not found in path $PATH" >&5 +$as_echo "$as_me: WARNING: thin_restore not found in path $PATH" >&2;} + THIN_RESTORE_CMD=/usr/sbin/thin_restore + THIN_CONFIGURE_WARN=y + } + fi ;; esac @@ -7589,6 +7708,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF + +cat >>confdefs.h <<_ACEOF +#define THIN_RESTORE_CMD "$THIN_RESTORE_CMD" +_ACEOF + + ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include cache" >&5 $as_echo_n "checking whether to include cache... " >&6; } @@ -11529,6 +11654,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` + ################################################################################ ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile conf/Makefile conf/example.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" diff --git a/configure.in b/configure.in index 6fbba27..16e63c0 100644 --- a/configure.in +++ b/configure.in @@ -422,6 +422,10 @@ AC_ARG_WITH(thin-repair, AC_HELP_STRING([--with-thin-repair=PATH], [thin_repair tool: [[autodetect]]]), THIN_REPAIR_CMD=$withval, THIN_REPAIR_CMD="autodetect") +AC_ARG_WITH(thin-restore, + AC_HELP_STRING([--with-thin-restore=PATH], + [thin_restore tool: [[autodetect]]]), + THIN_RESTORE_CMD=$withval, THIN_RESTORE_CMD="autodetect") AC_MSG_RESULT($THIN) @@ -484,6 +488,15 @@ case "$THIN" in THIN_CONFIGURE_WARN=y } fi + # Empty means a config way to ignore thin checking + if test "$THIN_RESTORE_CMD" = "autodetect"; then + AC_PATH_TOOL(THIN_RESTORE_CMD, thin_restore) + test -z "$THIN_RESTORE_CMD" && { + AC_MSG_WARN(thin_restore not found in path $PATH) + THIN_RESTORE_CMD=/usr/sbin/thin_restore + THIN_CONFIGURE_WARN=y + } + fi ;; esac @@ -502,6 +515,9 @@ AC_DEFINE_UNQUOTED([THIN_DUMP_CMD], ["$THIN_DUMP_CMD"], AC_DEFINE_UNQUOTED([THIN_REPAIR_CMD], ["$THIN_REPAIR_CMD"], [The path to 'thin_repair', if available.]) +AC_DEFINE_UNQUOTED([THIN_RESTORE_CMD], ["$THIN_RESTORE_CMD"], + [The path to 'thin_restore', if available.]) + ################################################################################ dnl -- cache inclusion type AC_MSG_CHECKING(whether to include cache) @@ -1739,6 +1755,7 @@ AC_SUBST(THIN) AC_SUBST(THIN_CHECK_CMD) AC_SUBST(THIN_DUMP_CMD) AC_SUBST(THIN_REPAIR_CMD) +AC_SUBST(THIN_RESTORE_CMD) AC_SUBST(UDEV_PC) AC_SUBST(UDEV_RULES) AC_SUBST(UDEV_SYNC) diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in index ead131c..c618ff4 100644 --- a/lib/misc/configure.h.in +++ b/lib/misc/configure.h.in @@ -562,6 +562,9 @@ /* The path to 'thin_repair', if available. */ #undef THIN_REPAIR_CMD +/* The path to 'thin_restore', if available. */ +#undef THIN_RESTORE_CMD + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME diff --git a/test/Makefile.in b/test/Makefile.in index 1538fa3..370d9bd 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -28,6 +28,7 @@ LVM_TEST_RESULTS ?= results export LVM_TEST_THIN_CHECK_CMD?=@THIN_CHECK_CMD@ export LVM_TEST_THIN_DUMP_CMD?=@THIN_DUMP_CMD@ export LVM_TEST_THIN_REPAIR_CMD?=@THIN_REPAIR_CMD@ +export LVM_TEST_THIN_RESTORE_CMD?=@THIN_RESTORE_CMD@ SUBDIRS = api unit SOURCES = lib/not.c lib/harness.c @@ -68,15 +69,16 @@ help: @echo -e "\nSupported variables:" @echo " LVM_TEST_CAN_CLOBBER_DMESG Allow to clobber dmesg buffer without /dev/kmsg. (1)" @echo " LVM_TEST_DEVDIR Set to '/dev' to run on real /dev." - @echo " LVM_TEST_DIR Where to create test files [$(LVM_TEST_DIR)]." + @echo " LVM_TEST_DIR Where to create test files [$(LVM_TEST_DIR)]." @echo " LVM_TEST_LOCKING Normal (1), Cluster (3)." @echo " LVM_TEST_LVMETAD Start lvmetad (1)." @echo " LVM_TEST_NODEBUG Do not debug lvm commands." @echo " LVM_TEST_PARALLEL May skip agresive wipe of LVMTEST resources." @echo " LVM_TEST_RESULTS Where to create result files [results]." - @echo " LVM_TEST_THIN_CHECK_CMD Command for thin_check [$(LVM_TEST_THIN_CHECK_CMD)]." - @echo " LVM_TEST_THIN_DUMP_CMD Command for thin_dump [$(LVM_TEST_THIN_DUMP_CMD)]." - @echo " LVM_TEST_THIN_REPAIR_CMD Command for thin_repair [$(LVM_TEST_THIN_REPAIR_CMD)]." + @echo " LVM_TEST_THIN_CHECK_CMD Command for thin_check [$(LVM_TEST_THIN_CHECK_CMD)]." + @echo " LVM_TEST_THIN_DUMP_CMD Command for thin_dump [$(LVM_TEST_THIN_DUMP_CMD)]." + @echo " LVM_TEST_THIN_REPAIR_CMD Command for thin_repair [$(LVM_TEST_THIN_REPAIR_CMD)]." + @echo " LVM_TEST_THIN_RESTORE_CMD Command for thin_restore [$(LVM_TEST_THIN_RESTORE_CMD)]." @echo " LVM_TEST_UNLIMITED Set to get unlimited test log (>32MB)" @echo " LVM_VALGRIND Enable valgrind testing (1,2,3) execs $$"VALGRIND @echo " LVM_VALGRIND_CLVMD Enable valgrind testing of clvmd (1)." diff --git a/test/shell/lvextend-thin-metadata-dmeventd.sh b/test/shell/lvextend-thin-metadata-dmeventd.sh index cb5261c..6e03d9d 100644 --- a/test/shell/lvextend-thin-metadata-dmeventd.sh +++ b/test/shell/lvextend-thin-metadata-dmeventd.sh @@ -42,6 +42,7 @@ fake_metadata_() { echo "</superblock>" } +test -n "$LVM_TEST_THIN_RESTORE_CMD" || LVM_TEST_THIN_RESTORE_CMD=$(which thin_restore) || skip aux have_thin 1 10 0 || skip aux prepare_dmeventd @@ -61,7 +62,7 @@ lvchange -an $vg/thin $vg/pool # Prepare some fake metadata with unmatching id # Transaction_id is lower by 1 and there are no message -> ERROR fake_metadata_ 10 0 >data -thin_restore -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1" +$LVM_TEST_THIN_RESTORE_CMD -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1" lvconvert -y --thinpool $vg/pool --poolmetadata $vg/$lv1 not vgchange -ay $vg 2>&1 | tee out grep expected out @@ -70,7 +71,7 @@ check inactive $vg pool_tmeta # Transaction_id is higher by 1 fake_metadata_ 10 2 >data -thin_restore -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1" +$LVM_TEST_THIN_RESTORE_CMD -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1" lvconvert -y --thinpool $vg/pool --poolmetadata $vg/$lv1 not vgchange -ay $vg 2>&1 | tee out grep expected out @@ -79,7 +80,7 @@ check inactive $vg pool_tmeta # Prepare some fake metadata prefilled to ~81% (>70%) fake_metadata_ 400 1 >data -thin_restore -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1" +$LVM_TEST_THIN_RESTORE_CMD -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1" # Swap volume with restored fake metadata lvconvert -y --thinpool $vg/pool --poolmetadata $vg/$lv1

1 0

master - tests: update aux disable_dev
by Zdenek Kabelac 26 May '14

26 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b0ff3359f268913d… Commit: b0ff3359f268913dbe01179600aa69c008cbb1ec Parent: 49521f4e563fe0a19e70413f740e831f5fd16e16 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 26 15:58:09 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 26 22:57:28 2014 +0200 tests: update aux disable_dev disable_dev can't use transaction - since it may lead occasionaly to weird error - example could be nomda-missing.sh test case. Here occasionaly device instead of being removed was left as error device and testing different code path (which is unfortunatelly buggy) When we want to test 'error' device - 'aux error_dev()' should be used. --- test/lib/aux.sh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 07ba576..9a13cc8 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -407,7 +407,6 @@ disable_dev() { local dev udev_wait - init_udev_transaction for dev in "$@"; do maj=$(($(stat -L --printf=0x%t "$dev"))) min=$(($(stat -L --printf=0x%T "$dev"))) @@ -415,7 +414,6 @@ disable_dev() { dmsetup remove -f "$dev" 2>/dev/null || true notify_lvmetad --major "$maj" --minor "$min" done - finish_udev_transaction } enable_dev() { @@ -699,7 +697,7 @@ raid456_replace_works() { 3.6.*.fc18.i686*|3.6.*.fc18.x86_64) return 1 ;; 3.9.*.fc19.i686*|3.9.*.fc19.x86_64) return 1 ;; 3.1[0123].*.fc18.i686*|3.1[0123].*.fc18.x86_64) return 1 ;; - 3.1[0123].*.fc19.i686*|3.1[0123].*.fc19.x86_64) return 1 ;; + 3.1[01234].*.fc19.i686*|3.1[01234].*.fc19.x86_64) return 1 ;; 3.13.*.fc20.i686*|3.13.*.fc20.x86_64) return 1 ;; 3.14.*.fc21.i686*|3.14.*.fc21.x86_64) return 1 ;; 3.15.*rc6*.fc21.i686*|3.15.*rc6*.fc21.x86_64) return 1 ;;

1 0

master - cleanup: internal error for impossible path
by Zdenek Kabelac 26 May '14

26 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=49521f4e563fe0a1… Commit: 49521f4e563fe0a19e70413f740e831f5fd16e16 Parent: 965592340d04f02096b800107591290c1ad44443 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 23:53:04 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 26 22:57:28 2014 +0200 cleanup: internal error for impossible path Add 'default' path for impossible execution code path. --- lib/device/dev-md.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c index d6a7609..91cc322 100644 --- a/lib/device/dev-md.c +++ b/lib/device/dev-md.c @@ -60,7 +60,7 @@ typedef enum { static uint64_t _v1_sb_offset(uint64_t size, md_minor_version_t minor_version) { - uint64_t uninitialized_var(sb_offset); + uint64_t sb_offset; switch(minor_version) { case MD_MINOR_V0: @@ -72,6 +72,10 @@ static uint64_t _v1_sb_offset(uint64_t size, md_minor_version_t minor_version) case MD_MINOR_V2: sb_offset = 4 * 2; break; + default: + log_warn(INTERNAL_ERROR "WARNING: Unknown minor version %d.", + minor_version); + return 0; } sb_offset <<= SECTOR_SHIFT;

1 0

master - man: cleanup dmsetup
by Zdenek Kabelac 26 May '14

26 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=965592340d04f020… Commit: 965592340d04f02096b800107591290c1ad44443 Parent: 3cb2658fb7ff0bba45e66e79bce8812c819dff52 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 26 22:55:31 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 26 22:57:20 2014 +0200 man: cleanup dmsetup Add few bold texts. --- man/dmsetup.8.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in index ae84489..9a738fb 100644 --- a/man/dmsetup.8.in +++ b/man/dmsetup.8.in @@ -426,11 +426,11 @@ that contain a version of device-mapper prior to 4.8.0. In this case the device will be deleted when its open_count drops to zero. From version 4.8.0 onwards, if a device can't be removed because an uninterruptible process is waiting for -I/O to return from it, adding \-\-force will replace the table +I/O to return from it, adding \fB\-\-force\fP will replace the table with one that fails all I/O, which might allow the process to be killed. If an attempt to remove a device fails, perhaps because a process run from a quick udev rule -temporarily opened the device, the \-\-retry option will cause +temporarily opened the device, the \fB\-\-retry\fP option will cause the operation to be retried for a few seconds before failing. Do NOT combine \fB\-\-force\fP and \fB\-\-udevcookie\fP, as udev may start to process udev rules in the middle of error target @@ -443,7 +443,7 @@ replacement and result in nondeterministic result. Attempts to remove all device definitions i.e. reset the driver. Use with care! From version 4.8.0 onwards, if devices can't be removed because uninterruptible processes are waiting for -I/O to return from them, adding \-\-force will replace the table +I/O to return from them, adding \fB\-\-force\fP will replace the table with one that fails all I/O, which might allow the process to be killed. This also runs \fBmknodes\fP afterwards. .br @@ -494,7 +494,7 @@ Default subsystem is LVM. .RI [ device_name ] .br Outputs status information for each of the device's targets. -With \-\-target, only information relating to the specified target type +With \fB\-\-target\fP, only information relating to the specified target type any is displayed. With \fB\-\-noflush\fP, the thin target (from version 1.3.0) doesn't commit any outstanding changes to disk before reporting its statistics. .br

1 0

master - dmsetup: add warning
by Zdenek Kabelac 26 May '14

26 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3cb2658fb7ff0bba… Commit: 3cb2658fb7ff0bba45e66e79bce8812c819dff52 Parent: 6e9105c7bb7f4a1beb34579303670e4510c7d2e6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 26 22:51:04 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 26 22:56:30 2014 +0200 dmsetup: add warning Warn when --udevcookie/DM_UDEV_COOKIE is used with 'dmsetup remove --force'. When command is doing multiple ioctl operations on a single device, it may invoke udev activity, that is colliding with further ioctl commands. The result of such operation becomes unpredictable. Use of --retry could partially help... --- WHATS_NEW_DM | 1 + man/dmsetup.8.in | 6 ++++++ tools/dmsetup.c | 10 +++++++++- 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 6304ff6..8e221c1 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.88 - ================================= + Warn user about incorrect use of cookie with 'dmsetup remove --force'. Also recognize 'help'/'?' as reserved sort key name to show help. Export recognized DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} to show help. Add dm_units_to_factor for size unit parsing. diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in index 599c843..ae84489 100644 --- a/man/dmsetup.8.in +++ b/man/dmsetup.8.in @@ -243,6 +243,9 @@ Specify a one-line table directly on the command line. .TP .B \-\-udevcookie \fIcookie Use cookie for udev synchronisation. +Note: Same cookie should be used for same type of operations i.e. creation of +multiple different devices. It's not adviced to combine different +operations on the single device. .TP .BR \-u | \-\-uuid Specify the uuid. @@ -429,6 +432,9 @@ process to be killed. If an attempt to remove a device fails, perhaps because a process run from a quick udev rule temporarily opened the device, the \-\-retry option will cause the operation to be retried for a few seconds before failing. +Do NOT combine \fB\-\-force\fP and \fB\-\-udevcookie\fP, +as udev may start to process udev rules in the middle of error target +replacement and result in nondeterministic result. .br .HP .B remove_all diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 4433571..f84d1a8 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -1498,8 +1498,16 @@ error: static int _remove(CMD_ARGS) { - if (_switches[FORCE_ARG] && argc > 1) + if (_switches[FORCE_ARG] && argc > 1) { + /* + * 'remove --force' option is doing 2 operations on the same device + * this is not compatible with the use of --udevcookie/DM_UDEV_COOKIE. + * Udevd collision could be partially avoided with --retry. + */ + if (_udev_cookie) + log_warn("WARNING: Use of cookie and --force is not compatible."); (void) _error_device(cmd, argc, argv, NULL, 0); + } return _simple(DM_DEVICE_REMOVE, argc > 1 ? argv[1] : NULL, 0, 0); }

1 0

master - cleanup: use const for endptr in dm_units_to_factor
by Peter Rajnoha 26 May '14

26 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6e9105c7bb7f4a1b… Commit: 6e9105c7bb7f4a1beb34579303670e4510c7d2e6 Parent: cfe18d85c148c5d3c9407fac586b28b186471615 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon May 26 12:09:01 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon May 26 12:09:01 2014 +0200 cleanup: use const for endptr in dm_units_to_factor --- libdm/libdevmapper.h | 2 +- libdm/libdm-string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index d63b135..990692c 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1496,7 +1496,7 @@ int dm_strncpy(char *dest, const char *src, size_t n); * Returns the unit factor or 0 if no unit is recognized. */ uint64_t dm_units_to_factor(const char *units, char *unit_type, - int strict, char **endptr); + int strict, const char **endptr); /************************** * file/stream manipulation diff --git a/libdm/libdm-string.c b/libdm/libdm-string.c index 7336e6b..8ad479c 100644 --- a/libdm/libdm-string.c +++ b/libdm/libdm-string.c @@ -444,7 +444,7 @@ static int _close_enough(double d1, double d2) } uint64_t dm_units_to_factor(const char *units, char *unit_type, - int strict, char **endptr) + int strict, const char **endptr) { char *ptr = NULL; uint64_t v;

1 0

master - tests: improve command coverage
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cfe18d85c148c5d3… Commit: cfe18d85c148c5d3c9407fac586b28b186471615 Parent: b7476e91ef4370746f85e009becb65ef891cc3d0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 23:34:00 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 23:35:42 2014 +0200 tests: improve command coverage --- test/shell/listings.sh | 1 + test/shell/vgextend-restoremissing.sh | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/test/shell/listings.sh b/test/shell/listings.sh index 2121ecd..7069707 100644 --- a/test/shell/listings.sh +++ b/test/shell/listings.sh @@ -94,6 +94,7 @@ pvscan -e pvscan -s pvscan --novolumegroup vgscan --mknodes +vgmknodes --refresh lvscan lvmdiskscan diff --git a/test/shell/vgextend-restoremissing.sh b/test/shell/vgextend-restoremissing.sh index 143bff7..8812c8c 100644 --- a/test/shell/vgextend-restoremissing.sh +++ b/test/shell/vgextend-restoremissing.sh @@ -16,15 +16,37 @@ aux prepare_vg 3 lvcreate -an -Zn --type mirror -m 1 -l 1 -n mirror $vg lvcreate -l 1 -n lv1 $vg "$dev1" +# vgextend require vgname +invalid vgextend +# --metadatacopies => use --pvmetadatacopies +invalid vgextend --metadatacopies 3 $vg "$dev1" |& tee out +grep -- "use --pvmetadatacopies" out + +# VG name should exist +fail vgextend --restoremissing $vg-invalid "$dev1" + # try to just change metadata; we expect the new version (with MISSING_PV set # on the reappeared volume) to be written out to the previously missing PV aux disable_dev "$dev1" lvremove $vg/mirror +# try restore the still existing device +fail vgextend --restore $vg "$dev1" aux enable_dev "$dev1" not vgck $vg 2>&1 | tee log grep "missing 1 physical volume" log not lvcreate -aey --type mirror -m 1 -l 1 -n mirror $vg # write operations fail -vgextend --restore $vg "$dev1" # restore the missing device +# try restore the non-missing device +fail vgextend --restore $vg "$dev2" +# try restore the non-existing device +fail vgextend --restore $vg "$dev2-invalid" +# restore the missing device +vgextend --restore $vg "$dev1" + +vgreduce $vg "$dev3" +vgchange --metadatacopies 1 $vg +# 'n' failing to change volume group +fail vgextend --metadataignore y --pvmetadatacopies 2 $vg "$dev3" +vgextend --yes --metadataignore y --pvmetadatacopies 2 $vg "$dev3" vgck $vg lvcreate -an -Zn --type mirror -m 1 -l 1 -n mirror $vg

1 0

master - tests: add unusable kernel for raid5 testing
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b7476e91ef437074… Commit: b7476e91ef4370746f85e009becb65ef891cc3d0 Parent: c5c3995ed587aee6aaa15ea69df81c69a5bfbcd8 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 22:40:31 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 23:35:42 2014 +0200 tests: add unusable kernel for raid5 testing --- test/lib/aux.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 01bc1ea..07ba576 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -702,6 +702,7 @@ raid456_replace_works() { 3.1[0123].*.fc19.i686*|3.1[0123].*.fc19.x86_64) return 1 ;; 3.13.*.fc20.i686*|3.13.*.fc20.x86_64) return 1 ;; 3.14.*.fc21.i686*|3.14.*.fc21.x86_64) return 1 ;; + 3.15.*rc6*.fc21.i686*|3.15.*rc6*.fc21.x86_64) return 1 ;; esac }

1 0

master - tests: increase min version for raid testing
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c5c3995ed587aee6… Commit: c5c3995ed587aee6aaa15ea69df81c69a5bfbcd8 Parent: 3f8048f28c45101fde391c3609a97ca116b8e92c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 22:35:05 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 23:35:42 2014 +0200 tests: increase min version for raid testing Seems smaller version are causing weird kernel lookups. --- test/shell/lvchange-partial.sh | 2 +- test/shell/lvconvert-raid.sh | 2 +- test/shell/lvconvert-raid456.sh | 2 +- test/shell/lvconvert-repair-raid-dmeventd.sh | 2 +- test/shell/lvconvert-repair-raid.sh | 2 +- test/shell/lvcreate-large-raid.sh | 2 +- test/shell/lvcreate-raid.sh | 2 +- test/shell/lvresize-raid.sh | 2 +- test/shell/vgsplit-raid.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/shell/lvchange-partial.sh b/test/shell/lvchange-partial.sh index c3d7217..3db1b4f 100644 --- a/test/shell/lvchange-partial.sh +++ b/test/shell/lvchange-partial.sh @@ -15,7 +15,7 @@ aux prepare_vg 4 TYPE=raid1 -aux have_raid 1 1 0 || TYPE=mirror +aux have_raid 1 3 0 || TYPE=mirror lvcreate -aey --type $TYPE -m 1 -l 2 -n $lv1 $vg lvchange -an $vg/$lv1 diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh index 2a498b2..e17d90e 100644 --- a/test/shell/lvconvert-raid.sh +++ b/test/shell/lvconvert-raid.sh @@ -22,7 +22,7 @@ get_image_pvs() { ######################################################## # MAIN ######################################################## -aux have_raid 1 2 0 || skip +aux have_raid 1 3 0 || skip aux prepare_pvs 5 vgcreate -s 256k $vg $(cat DEVICES) diff --git a/test/shell/lvconvert-raid456.sh b/test/shell/lvconvert-raid456.sh index b9386c9..38f8ed5 100644 --- a/test/shell/lvconvert-raid456.sh +++ b/test/shell/lvconvert-raid456.sh @@ -23,7 +23,7 @@ get_image_pvs() { # MAIN ######################################################## aux raid456_replace_works || skip -aux have_raid 1 2 0 || skip +aux have_raid 1 3 0 || skip aux prepare_pvs 6 vgcreate -s 256k $vg $(cat DEVICES) diff --git a/test/shell/lvconvert-repair-raid-dmeventd.sh b/test/shell/lvconvert-repair-raid-dmeventd.sh index f83e722..6766faa 100644 --- a/test/shell/lvconvert-repair-raid-dmeventd.sh +++ b/test/shell/lvconvert-repair-raid-dmeventd.sh @@ -12,7 +12,7 @@ . lib/test which mkfs.ext3 || skip -aux have_raid 1 1 0 || skip +aux have_raid 1 3 0 || skip aux prepare_dmeventd aux prepare_vg 5 diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh index df64f3b..8ba27b8 100644 --- a/test/shell/lvconvert-repair-raid.sh +++ b/test/shell/lvconvert-repair-raid.sh @@ -11,7 +11,7 @@ . lib/test -aux have_raid 1 1 0 || skip +aux have_raid 1 3 0 || skip aux raid456_replace_works || skip aux lvmconf 'allocation/maximise_cling = 0' diff --git a/test/shell/lvcreate-large-raid.sh b/test/shell/lvcreate-large-raid.sh index 84110ab..57a7765 100644 --- a/test/shell/lvcreate-large-raid.sh +++ b/test/shell/lvcreate-large-raid.sh @@ -16,7 +16,7 @@ # FIXME update test to make something useful on <16T aux can_use_16T || skip -aux have_raid 1 1 0 || skip +aux have_raid 1 3 0 || skip aux prepare_vg 5 diff --git a/test/shell/lvcreate-raid.sh b/test/shell/lvcreate-raid.sh index d9c949a..76a606f 100644 --- a/test/shell/lvcreate-raid.sh +++ b/test/shell/lvcreate-raid.sh @@ -18,7 +18,7 @@ lv_devices() { ######################################################## # MAIN ######################################################## -aux have_raid 1 1 0 || skip +aux have_raid 1 3 0 || skip aux prepare_pvs 6 20 # 6 devices for RAID10 (2-mirror,3-stripe) test vgcreate -s 512k $vg $(cat DEVICES) diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh index e13a08d..d5288f8 100644 --- a/test/shell/lvresize-raid.sh +++ b/test/shell/lvresize-raid.sh @@ -11,7 +11,7 @@ . lib/test -aux have_raid 1 1 0 || skip +aux have_raid 1 3 0 || skip aux prepare_pvs 6 80 diff --git a/test/shell/vgsplit-raid.sh b/test/shell/vgsplit-raid.sh index 6454556..3174e88 100644 --- a/test/shell/vgsplit-raid.sh +++ b/test/shell/vgsplit-raid.sh @@ -21,7 +21,7 @@ create_vg_() { vgcreate -s 64k "$@" } -aux have_raid 1 1 0 || skip +aux have_raid 1 3 0 || skip aux prepare_pvs 5 10

1 0

master - vgextend: allow --yes to skip prompt
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3f8048f28c45101f… Commit: 3f8048f28c45101fde391c3609a97ca116b8e92c Parent: 1a840323229555889184e831000b0c22f273ef66 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 23:33:17 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 23:35:40 2014 +0200 vgextend: allow --yes to skip prompt --- WHATS_NEW | 1 + tools/vgextend.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 491dece..a2b8af7 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Allow --yes to skip prompt in vgextend (worked only with -f). Don't use name mangling for LVM - it never uses dm names with wrong char set. Remove default.profile and add {command,metadata}_profile_template.profile. Use proper umask for systemd units generated by lvm2-activation-generator. diff --git a/tools/vgextend.c b/tools/vgextend.c index 0c00b7f..2dc1699 100644 --- a/tools/vgextend.c +++ b/tools/vgextend.c @@ -102,9 +102,9 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) if (arg_count(cmd, metadataignore_ARG) && (vg_mda_copies(vg) != VGMETADATACOPIES_UNMANAGED) && - (pp.force == PROMPT) && + (pp.force == PROMPT) && !pp.yes && yes_no_prompt("Override preferred number of copies " - "of VG %s metadata? [y/n]: ", + "of VG %s metadata? [y/n]: ", vg_name) == 'n') { log_error("Volume group %s not changed", vg_name); goto bad;

1 0

master - cleanup: indent
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1a84032322955588… Commit: 1a840323229555889184e831000b0c22f273ef66 Parent: bf6b69c46b77f7b61c688b99b2bbaab0c46d840c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 14:25:12 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 21:37:12 2014 +0200 cleanup: indent --- lib/metadata/lv_manip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 5fa75e1..76a9103 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4310,7 +4310,7 @@ int lv_resize_prepare(struct cmd_context *cmd, struct logical_volume *lv, if (lp->poolmetadatasize && !_lvresize_poolmetadata_prepare(cmd, lp, lv)) - return_0; + return_0; return 1; }

1 0

master - cleanup: use directly segtype->name
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bf6b69c46b77f7b6… Commit: bf6b69c46b77f7b61c688b99b2bbaab0c46d840c Parent: 952514611d258f99e29b29daf25e285f9286c60a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 14:24:46 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 21:36:55 2014 +0200 cleanup: use directly segtype->name Simplify printing of segtype name. --- lib/metadata/lv_manip.c | 1 - lib/metadata/merge.c | 35 ++++++++++------------------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 37c7686..5fa75e1 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6116,7 +6116,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, */ log_error("Can't create %s without using " "device-mapper kernel driver.", - seg_is_thin_pool(lp) ? "thin pool volume" : lp->segtype->name); return NULL; } diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index 319df4b..9d6df34 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -194,35 +194,23 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg) if (seg_is_pool(seg)) { if (seg->area_count != 1 || seg_type(seg, 0) != AREA_LV) { - log_error("LV %s: %spool segment %u is missing a pool data LV", - lv->name, - seg_is_thin_pool(seg) ? - "thin " : "cache", - seg_count); + log_error("LV %s: %s segment %u is missing a pool data LV", + lv->name, seg->segtype->name, seg_count); inc_error_count; } else if (!(seg2 = first_seg(seg_lv(seg, 0))) || find_pool_seg(seg2) != seg) { - log_error("LV %s: %spool segment %u data LV does not refer back to pool LV", - lv->name, - seg_is_thin_pool(seg) ? - "thin " : "cache", - seg_count); + log_error("LV %s: %s segment %u data LV does not refer back to pool LV", + lv->name, seg->segtype->name, seg_count); inc_error_count; } if (!seg->metadata_lv) { - log_error("LV %s: %spool segment %u is missing a pool metadata LV", - lv->name, - seg_is_thin_pool(seg) ? - "thin " : "cache", - seg_count); + log_error("LV %s: %s segment %u is missing a pool metadata LV", + lv->name, seg->segtype->name, seg_count); inc_error_count; } else if (!(seg2 = first_seg(seg->metadata_lv)) || find_pool_seg(seg2) != seg) { - log_error("LV %s: %spool segment %u metadata LV does not refer back to pool LV", - lv->name, - seg_is_thin_pool(seg) ? - "thin " : "cache", - seg_count); + log_error("LV %s: %s segment %u metadata LV does not refer back to pool LV", + lv->name, seg->segtype->name, seg_count); inc_error_count; } @@ -232,11 +220,8 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg) (seg_is_cache_pool(seg) && ((seg->chunk_size < DM_CACHE_MIN_DATA_BLOCK_SIZE) || (seg->chunk_size > DM_CACHE_MAX_DATA_BLOCK_SIZE)))) { - log_error("LV %s: %spool segment %u has chunk size %u out of range.", - lv->name, - seg_is_thin_pool(seg) ? - "thin " : "cache", - seg_count, seg->chunk_size); + log_error("LV %s: %s segment %u has chunk size %u out of range.", + lv->name, seg->segtype->name, seg_count, seg->chunk_size); inc_error_count; } } else {

1 0

master - cleanup: add seg_is_pool macro
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=952514611d258f99… Commit: 952514611d258f99e29b29daf25e285f9286c60a Parent: cb7bba9ffe48cecaf92912d04255171bf2f79bf6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 14:24:28 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 21:36:55 2014 +0200 cleanup: add seg_is_pool macro Simplify code querying for pool segtype. --- lib/metadata/lv.c | 2 +- lib/metadata/lv_manip.c | 8 +++----- lib/metadata/merge.c | 2 +- lib/metadata/pool_manip.c | 7 +++---- lib/metadata/segtype.h | 2 ++ 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 4dbcb20..5414d94 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -170,7 +170,7 @@ uint64_t lvseg_chunksize(const struct lv_segment *seg) if (lv_is_cow(seg->lv)) size = (uint64_t) find_snapshot(seg->lv)->chunk_size; - else if (seg_is_thin_pool(seg) || seg_is_cache_pool(seg)) + else if (seg_is_pool(seg)) size = (uint64_t) seg->chunk_size; else size = UINT64_C(0); diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 91a15f2..37c7686 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6077,7 +6077,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, return NULL; } - if (seg_is_thin_pool(lp) || seg_is_cache_pool(lp)) { + if (seg_is_pool(lp)) { if (((uint64_t)lp->extents * vg->extent_size < lp->chunk_size)) { log_error("Unable to create %s smaller than 1 chunk.", lp->segtype->name); @@ -6107,8 +6107,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, if (!activation() && (seg_is_mirrored(lp) || seg_is_raid(lp) || - seg_is_thin_pool(lp) || - seg_is_cache_pool(lp))) { + seg_is_pool(lp))) { /* * FIXME: For thin pool add some code to allow delayed * initialization of empty thin pool volume. @@ -6208,8 +6207,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_thin_pool(lp) || seg_is_cache_pool(lp)) ? - lp->poolmetadataextents : lp->region_size, + seg_is_pool(lp) ? lp->poolmetadataextents : lp->region_size, seg_is_thin_volume(lp) ? lp->voriginextents : lp->extents, thin_name, lp->pvh, lp->alloc, lp->approx_alloc)) return_NULL; diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index 146034f..319df4b 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -191,7 +191,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg) } } - if (seg_is_thin_pool(seg) || seg_is_cache_pool(seg)) { + if (seg_is_pool(seg)) { if (seg->area_count != 1 || seg_type(seg, 0) != AREA_LV) { log_error("LV %s: %spool segment %u is missing a pool data LV", diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index fe14034..ab52ff1 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -27,7 +27,7 @@ int attach_pool_metadata_lv(struct lv_segment *pool_seg, struct logical_volume *metadata_lv) { - if (!seg_is_thin_pool(pool_seg) && !seg_is_cache_pool(pool_seg)) { + if (!seg_is_pool(pool_seg)) { log_error(INTERNAL_ERROR "Unable to attach pool metadata LV to %s segtype.", pool_seg->segtype->ops->name(pool_seg)); @@ -44,7 +44,7 @@ int attach_pool_metadata_lv(struct lv_segment *pool_seg, int attach_pool_data_lv(struct lv_segment *pool_seg, struct logical_volume *pool_data_lv) { - if (!seg_is_thin_pool(pool_seg) && !seg_is_cache_pool(pool_seg)) { + if (!seg_is_pool(pool_seg)) { log_error(INTERNAL_ERROR "Unable to attach pool data LV to %s segtype.", pool_seg->segtype->ops->name(pool_seg)); @@ -199,8 +199,7 @@ struct lv_segment *find_pool_seg(const struct lv_segment *seg) return NULL; } - if ((lv_is_thin_type(seg->lv) && !seg_is_thin_pool(pool_seg)) && - !seg_is_cache_pool(pool_seg)) { + if ((lv_is_thin_type(seg->lv) && !seg_is_pool(pool_seg))) { log_error("%s on %s is not a %s pool segment", pool_seg->lv->name, seg->lv->name, lv_is_thin_type(seg->lv) ? "thin" : "cache"); diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h index 4f060cd..1a4a92f 100644 --- a/lib/metadata/segtype.h +++ b/lib/metadata/segtype.h @@ -48,6 +48,7 @@ struct dev_manager; #define segtype_is_cache(segtype) ((segtype)->flags & SEG_CACHE ? 1 : 0) #define segtype_is_cache_pool(segtype) ((segtype)->flags & SEG_CACHE_POOL ? 1 : 0) #define segtype_is_mirrored(segtype) ((segtype)->flags & SEG_AREAS_MIRRORED ? 1 : 0) +#define segtype_is_pool(segtype) ((segtype)->flags & (SEG_CACHE_POOL | SEG_THIN_POOL) ? 1 : 0) #define segtype_is_raid(segtype) ((segtype)->flags & SEG_RAID ? 1 : 0) #define segtype_is_striped(segtype) ((segtype)->flags & SEG_AREAS_STRIPED ? 1 : 0) #define segtype_is_thin(segtype) ((segtype)->flags & (SEG_THIN_POOL|SEG_THIN_VOLUME) ? 1 : 0) @@ -59,6 +60,7 @@ struct dev_manager; #define seg_is_cache_pool(seg) segtype_is_cache_pool((seg)->segtype) #define seg_is_linear(seg) (seg_is_striped(seg) && ((seg)->area_count == 1)) #define seg_is_mirrored(seg) segtype_is_mirrored((seg)->segtype) +#define seg_is_pool(seg) segtype_is_pool((seg)->segtype) #define seg_is_raid(seg) segtype_is_raid((seg)->segtype) #define seg_is_replicator(seg) ((seg)->segtype->flags & SEG_REPLICATOR ? 1 : 0) #define seg_is_replicator_dev(seg) ((seg)->segtype->flags & SEG_REPLICATOR_DEV ? 1 : 0)

1 0

master - dev_manager: disable extra udev loop
by Zdenek Kabelac 23 May '14

23 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cb7bba9ffe48ceca… Commit: cb7bba9ffe48cecaf92912d04255171bf2f79bf6 Parent: ec9da34d86f7d573b3925b0f33ed9d19afa4d846 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 23 21:22:38 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri May 23 21:36:55 2014 +0200 dev_manager: disable extra udev loop Disable code which has postprocessed whole tree and reset udev flags. We need to find out which case was troublesome - since this loop was just hidding bug in other code parts (most probably preload tree) --- lib/activate/dev_manager.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index fb9625d..cfceab5 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -2436,6 +2436,7 @@ static int _add_segment_to_dtree(struct dev_manager *dm, return 1; } +#if 0 static int _set_udev_flags_for_children(struct dev_manager *dm, struct volume_group *vg, struct dm_tree_node *dnode) @@ -2486,6 +2487,7 @@ static int _set_udev_flags_for_children(struct dev_manager *dm, return 1; } +#endif static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, struct logical_volume *lv, struct lv_activate_opts *laopts, @@ -2648,8 +2650,11 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, if (!_add_new_lv_to_dtree(dm, dtree, sl->seg->lv, laopts, NULL)) return_0; +#if 0 + /* Should not be needed, will be removed */ if (!_set_udev_flags_for_children(dm, lv->vg, dnode)) return_0; +#endif return 1; }

1 0

master - tests: check more things with vgchange
by Zdenek Kabelac 22 May '14

22 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ec9da34d86f7d573… Commit: ec9da34d86f7d573b3925b0f33ed9d19afa4d846 Parent: 65b0948c1e9baf65e7f1bffe0f01c355d094cf9c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 22 12:00:59 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 22 12:01:44 2014 +0200 tests: check more things with vgchange --- test/shell/vgchange-usage.sh | 80 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 72 insertions(+), 8 deletions(-) diff --git a/test/shell/vgchange-usage.sh b/test/shell/vgchange-usage.sh index 0ae9c14..0d57913 100644 --- a/test/shell/vgchange-usage.sh +++ b/test/shell/vgchange-usage.sh @@ -13,33 +13,97 @@ test_description='Exercise some vgchange diagnostics' . lib/test -aux prepare_pvs 3 +aux prepare_pvs 4 + pvcreate --metadatacopies 0 "$dev1" -vgcreate $vg $(cat DEVICES) +vgcreate -s 4M $vg "$dev1" "$dev2" "$dev3" + +# cannot change anything in exported vg +vgexport $vg +fail vgchange -ay $vg +fail vgchange -p 8 $vg +fail vgchange -x n $vg +fail vgchange --addtag tag $vg +fail vgchange --deltag tag $vg +fail vgchange -s 4k $vg +fail vgchange --uuid $vg +fail vgchange --alloc anywhere $vg +fail vgchange -c y $vg +vgimport $vg + +# unsupported combinations of options... +invalid vgchange --ignorelockingfailure --uuid $vg +invalid vgchange --sysinit --alloc normal $vg +invalid vgchange --sysinit --poll y $vg +invalid vgchange -an --poll y $vg +invalid vgchange -an --monitor y $vg +invalid vgchange -ay --refresh $vg vgdisplay $vg # vgchange -p MaxPhysicalVolumes (bz202232) -aux check vg_field $vg max_pv 0 +check vg_field $vg max_pv 0 vgchange -p 128 $vg -aux check vg_field $vg max_pv 128 +check vg_field $vg max_pv 128 pv_count=$(get vg_field $vg pv_count) not vgchange -p 2 $vg 2>err grep "MaxPhysicalVolumes is less than the current number $pv_count of PVs for" err -aux check vg_field $vg max_pv 128 +check vg_field $vg max_pv 128 # vgchange -l MaxLogicalVolumes -aux check vg_field $vg max_lv 0 +check vg_field $vg max_lv 0 +invalid vgchange -l -128 $vg vgchange -l 128 $vg -aux check vg_field $vg max_lv 128 +check vg_field $vg max_lv 128 +# vgchange -s lvcreate -l4 -n $lv1 $vg lvcreate -l4 -n $lv2 $vg +SIZELV2=$(get lv_field $vg/$lv2 size) +check lv_field $vg/$lv2 seg_size_pe "4" +vgchange -s 4K $vg +check vg_field $vg vg_extent_size "4.00k" +check lv_field $vg/$lv2 size "$SIZELV2" +check lv_field $vg/$lv2 seg_size_pe "4096" + lv_count=$(get vg_field $vg lv_count) not vgchange -l 1 $vg 2>err grep "MaxLogicalVolume is less than the current number $lv_count of LVs for" err -aux check vg_field $vg max_lv 128 +check vg_field $vg max_lv 128 + +# check non-resizebility +fail vgchange -x y $vg +check vg_attr_bit resizeable $vg "z" +vgchange -x n $vg +check vg_attr_bit resizeable $vg "-" +fail vgchange -x n $vg +fail vgextend $vg "$dev4" +vgremove -ff $vg + +# set cluster bit +vgcreate -cn $vg "$dev1" "$dev2" "$dev3" +# check prompt to change cluster bit without giving explicit vg name +fail vgchange -cy |& tee out +grep "y/n" out +check vg_attr_bit cluster $vg "-" +vgchange -cy $vg +fail vgchange -cy $vg + +# check on cluster +# either skipped as clustered (non-cluster), or already clustered (on cluster) +if test -e LOCAL_CLVMD ; then + check vg_attr_bit cluster $vg "c" + vgchange -cn $vg +else + fail vgs $vg |& tee out + grep "Skipping clustered volume group" out + vgs --ignoreskippedcluster $vg |& tee out + not grep "Skipping clustered volume group" out + # reset back to non-clustered VG with disabled locking + vgchange -cn --config 'global{locking_type=0}' $vg +fi +check vg_attr_bit cluster $vg "-" vgremove -ff $vg

1 0

master - tests: swap tests
by Zdenek Kabelac 22 May '14

22 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=65b0948c1e9baf65… Commit: 65b0948c1e9baf65e7f1bffe0f01c355d094cf9c Parent: 1208e92b3476d4350b0734897ed9adb30697dcfd Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 22 12:00:46 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 22 12:01:44 2014 +0200 tests: swap tests --- test/shell/lvconvert-repair-raid.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh index 7d4ea7e..df64f3b 100644 --- a/test/shell/lvconvert-repair-raid.sh +++ b/test/shell/lvconvert-repair-raid.sh @@ -11,8 +11,8 @@ . lib/test -aux raid456_replace_works || skip aux have_raid 1 1 0 || skip +aux raid456_replace_works || skip aux lvmconf 'allocation/maximise_cling = 0' aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'

1 0

master - tests: add check vg_attr_bit
by Zdenek Kabelac 22 May '14

22 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1208e92b3476d435… Commit: 1208e92b3476d4350b0734897ed9adb30697dcfd Parent: 406ce3760bb619a3104ca2ef58e809c29907d506 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 22 11:59:11 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 22 12:01:44 2014 +0200 tests: add check vg_attr_bit Similar function like 'check lv_attr_bit' --- test/lib/check.sh | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/test/lib/check.sh b/test/lib/check.sh index 9c80d9a..cd29ef4 100644 --- a/test/lib/check.sh +++ b/test/lib/check.sh @@ -282,6 +282,21 @@ vg_field() { die "vg_field: vg=$1, field=\"$2\", actual=\"$actual\", expected=\"$3\"" } +vg_attr_bit() { + local actual=$(get vg_field "$2" vg_attr "${@:4}") + local offset=$1 + case "$offset" in + perm*) offset=0 ;; + resiz*) offset=1 ;; + export*) offset=2 ;; + partial) offset=3 ;; + alloc*) offset=4 ;; + cluster*) offset=5 ;; + esac + test "${actual:$offset:1}" = "$3" || \ + die "vg_attr_bit: vg=$2, ${offset} bit of \"$actual\" is \"${actual:$offset:1}\", but expected \"$3\"" +} + lv_field() { local actual=$(get lv_field "$1" "$2" "${@:4}") test "$actual" = "$3" || \

1 0

master - tests: detect raid presence
by Zdenek Kabelac 22 May '14

22 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=406ce3760bb619a3… Commit: 406ce3760bb619a3104ca2ef58e809c29907d506 Parent: 496953fb3915a7a985558a7a1b2edf534e170dfd Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 22 11:58:44 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 22 12:01:44 2014 +0200 tests: detect raid presence --- test/shell/lvconvert-repair-raid-dmeventd.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/shell/lvconvert-repair-raid-dmeventd.sh b/test/shell/lvconvert-repair-raid-dmeventd.sh index a825aa2..f83e722 100644 --- a/test/shell/lvconvert-repair-raid-dmeventd.sh +++ b/test/shell/lvconvert-repair-raid-dmeventd.sh @@ -12,6 +12,7 @@ . lib/test which mkfs.ext3 || skip +aux have_raid 1 1 0 || skip aux prepare_dmeventd aux prepare_vg 5

1 0

master - cleanup: use y/n instead of y|n
by Zdenek Kabelac 22 May '14

22 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=496953fb3915a7a9… Commit: 496953fb3915a7a985558a7a1b2edf534e170dfd Parent: 1c4fe47308e3638b95f042a1efc942c5ce8e4fdc Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 22 11:57:51 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 22 12:01:43 2014 +0200 cleanup: use y/n instead of y|n Use same for of yes no query everywhere. --- man/fsadm.8.in | 2 +- tools/lvconvert.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/fsadm.8.in b/man/fsadm.8.in index 46be1ff..20ec4c8 100644 --- a/man/fsadm.8.in +++ b/man/fsadm.8.in @@ -55,7 +55,7 @@ A status code of 1 is used for other failures. Resize the filesystem on logical volume /dev/vg/test to 1000 megabytes. If /dev/vg/test contains ext2/ext3/ext4 filesystem it will be unmounted prior the resize. -All [y|n] questions will be answered 'y'. +All [y/n] questions will be answered 'y'. .sp .B fsadm \-e \-y resize /dev/vg/test 1000M .SH ENVIRONMENT VARIABLES diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 79f2be5..82ce360 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -2721,7 +2721,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)"); if (!lp->yes && - yes_no_prompt("Do you really want to convert \"%s/%s\"? [y|n]: ", + yes_no_prompt("Do you really want to convert \"%s/%s\"? [y/n]: ", pool_lv->vg->name, pool_lv->name) == 'n') { log_error("Conversion aborted."); return 0; @@ -2839,7 +2839,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)"); if (!lp->yes && - yes_no_prompt("Do you really want to convert \"%s/%s\"? [y|n]: ", + yes_no_prompt("Do you really want to convert \"%s/%s\"? [y/n]: ", metadata_lv->vg->name, metadata_lv->name) == 'n') { log_error("Conversion aborted."); return 0;

1 0

master - lvm_init: don't use name mangling for LVM
by Peter Rajnoha 22 May '14

22 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1c4fe47308e3638b… Commit: 1c4fe47308e3638b95f042a1efc942c5ce8e4fdc Parent: b2da0f0a5b5b99c10c2ea531b63a3d9466eb1832 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu May 22 09:56:44 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu May 22 10:00:19 2014 +0200 lvm_init: don't use name mangling for LVM LVM has restricter character set that is allowed for VG-LV names and the dm names constructed do not contain any blacklisted characters that would require name mangling. Also, when any other device-mapper device is scanned that could possibly contain such blacklisted characters, we reference the device by its major:minor instead of dm name (e.g. _device_is_usable fn). --- WHATS_NEW | 1 + liblvm/lvm_base.c | 7 +++++++ tools/lvmcmdline.c | 7 +++++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 61753d6..491dece 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Don't use name mangling for LVM - it never uses dm names with wrong char set. Remove default.profile and add {command,metadata}_profile_template.profile. Use proper umask for systemd units generated by lvm2-activation-generator. Check for failing mirror_remove_missing() function. diff --git a/liblvm/lvm_base.c b/liblvm/lvm_base.c index 2a373ba..47ad241 100644 --- a/liblvm/lvm_base.c +++ b/liblvm/lvm_base.c @@ -35,6 +35,13 @@ static lvm_t _lvm_init(const char *system_dir) if (!udev_init_library_context()) stack; + /* + * It's not necessary to use name mangling for LVM: + * - the character set used for VG-LV names is subset of udev character set + * - when we check other devices (e.g. _device_is_usable fn), we use major:minor, not dm names + */ + dm_set_name_mangling_mode(DM_STRING_MANGLING_NONE); + /* create context */ /* FIXME: split create_toolcontext */ /* FIXME: make all globals configurable */ diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 96e478f..66f691e 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1527,6 +1527,13 @@ struct cmd_context *init_lvm(void) if (!udev_init_library_context()) stack; + /* + * It's not necessary to use name mangling for LVM: + * - the character set used for LV names is subset of udev character set + * - when we check other devices (e.g. _device_is_usable fn), we use major:minor, not dm names + */ + dm_set_name_mangling_mode(DM_STRING_MANGLING_NONE); + if (!(cmd = create_toolcontext(0, NULL, 1, 0))) { udev_fin_library_context(); return_NULL;

1 0

master - tests: raid and dmeventd
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b2da0f0a5b5b99c1… Commit: b2da0f0a5b5b99c10c2ea531b63a3d9466eb1832 Parent: 37b4dc777590ed0e6771833dce4c0727dfc72465 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 23:13:59 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 23:14:42 2014 +0200 tests: raid and dmeventd --- test/shell/lvconvert-repair-raid-dmeventd.sh | 28 ++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/test/shell/lvconvert-repair-raid-dmeventd.sh b/test/shell/lvconvert-repair-raid-dmeventd.sh new file mode 100644 index 0000000..a825aa2 --- /dev/null +++ b/test/shell/lvconvert-repair-raid-dmeventd.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# 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 +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +. lib/test + +which mkfs.ext3 || skip + +aux prepare_dmeventd +aux prepare_vg 5 + +lvcreate -aey --type raid1 -m 3 --ignoremonitoring -L 1 -n 4way $vg +lvchange --monitor y $vg/4way +lvs -a -o all,lv_modules $vg +lvdisplay --maps $vg +aux disable_dev "$dev2" "$dev4" +mkfs.ext3 "$DM_DEV_DIR/$vg/4way" +sleep 10 # FIXME: need a "poll" utility, akin to "check" +aux enable_dev "$dev2" "$dev4" + +vgremove -ff $vg

1 0

master - tests: more pvchange tests
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=37b4dc777590ed0e… Commit: 37b4dc777590ed0e6771833dce4c0727dfc72465 Parent: 79f466524377f08ff4a736f159eac44f9923f4f1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 23:13:19 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 23:14:42 2014 +0200 tests: more pvchange tests --- test/shell/pvchange-usage.sh | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/test/shell/pvchange-usage.sh b/test/shell/pvchange-usage.sh index 00489bd..71388de 100644 --- a/test/shell/pvchange-usage.sh +++ b/test/shell/pvchange-usage.sh @@ -77,7 +77,11 @@ check pvlv_counts $vg1 2 0 0 # some args are needed invalid pvchange - +# some PV needed +invalid pvchange --addtag tag +invalid pvchange --deltag tag +# some --all & PV can go together +invalid pvchange -a "$dev1" --addtag tag # '-a' needs more params invalid pvchange -a # '-a' is searching for devs, so specifying device is invalid @@ -91,6 +95,11 @@ not pvchange -u "$dev1" vgremove -f $vg1 -# "pvchange reject --addtag to lvm1 pv" +# cannot change PV tag to PV that is not in VG" +fail pvchange "$dev1" --addtag test +fail pvchange "$dev1" --deltag test + +# cannot add PV tag to lvm1 format pvcreate -M1 "$dev1" -not pvchange "$dev1" --addtag test +vgcreate -M1 $vg1 "$dev1" +fail pvchange "$dev1" --addtag test

1 0

master - tests: more vgcfgrestore testing
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=79f466524377f08f… Commit: 79f466524377f08ff4a736f159eac44f9923f4f1 Parent: a4ac21aded0eec0e93ce0026cb77cd377d8713ef Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 23:12:00 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 23:14:41 2014 +0200 tests: more vgcfgrestore testing Check '-l' and archiving. --- test/shell/vgcfgbackup-usage.sh | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/test/shell/vgcfgbackup-usage.sh b/test/shell/vgcfgbackup-usage.sh index 193bb9d..bc09b5b 100644 --- a/test/shell/vgcfgbackup-usage.sh +++ b/test/shell/vgcfgbackup-usage.sh @@ -31,12 +31,22 @@ vgcfgbackup test -e etc/backup/$vg1 test -e etc/backup/$vg2 +aux lvmconf "backup/archive = 1" + vgcfgbackup -f "bak-%s" >out grep "Volume group \"$vg1\" successfully backed up." out grep "Volume group \"$vg2\" successfully backed up." out # increase seqno lvcreate -an -Zn -l1 $vg1 -vgcfgrestore -f "bak-$vg1" $vg1 + +invalid vgcfgrestore -f "bak-$vg1" $vg1-inv@lid +invalid vgcfgrestore -f "bak-$vg1" $vg1 $vg2 + +vgcfgrestore -l $vg1 | tee out +test $(grep Description out | wc -l) -eq 2 + +vgcfgrestore -l -f "bak-$vg1" $vg1 + vgremove -ff $vg1 $vg2 # vgcfgbackup correctly stores metadata with missing PVs

1 0

master - cleanup: make error message more readable
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a4ac21aded0eec0e… Commit: a4ac21aded0eec0e93ce0026cb77cd377d8713ef Parent: aafd7c878c2a4bdcb72182bd31e52bae280898d1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 23:10:35 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 23:14:41 2014 +0200 cleanup: make error message more readable --- tools/pvchange.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/pvchange.c b/tools/pvchange.c index f87cd8c..afa6829 100644 --- a/tools/pvchange.c +++ b/tools/pvchange.c @@ -177,7 +177,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv) } if (arg_count(cmd, all_ARG) && argc) { - log_error("Option a and PhysicalVolumePath are exclusive"); + log_error("Option --all and PhysicalVolumePath are exclusive."); return EINVALID_CMD_LINE; }

1 0

master - cleanup: indent
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=aafd7c878c2a4bdc… Commit: aafd7c878c2a4bdcb72182bd31e52bae280898d1 Parent: 3ac7d2deb4270504dbae369b0b1bf14cb25a1b38 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 23:10:02 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 23:14:41 2014 +0200 cleanup: indent --- lib/metadata/metadata.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 4791c10..fd81c1b 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -769,7 +769,7 @@ int vg_reduce(struct volume_group *vg, const char *pv_name) } log_error("Unable to remove physical volume '%s' from " - "volume group '%s'.", pv_name, vg->name); + "volume group '%s'.", pv_name, vg->name); return 0; }

1 0

master - vgcfgrestore: return invalid cmd line
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3ac7d2deb4270504… Commit: 3ac7d2deb4270504dbae369b0b1bf14cb25a1b38 Parent: 9c4953df1b5b2e2e509f6f89598a733d5d580f2b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 23:11:15 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 23:14:41 2014 +0200 vgcfgrestore: return invalid cmd line When error is detected on command line options, return '3'. --- tools/vgcfgrestore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index 36396c3..07c5c20 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -23,11 +23,11 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) vg_name = skip_dev_dir(cmd, argv[0], NULL); if (!validate_name(vg_name)) { log_error("Volume group name \"%s\" is invalid", vg_name); - return ECMD_FAILED; + return EINVALID_CMD_LINE; } } else if (!(arg_count(cmd, list_ARG) && arg_count(cmd, file_ARG))) { log_error("Please specify a *single* volume group to restore."); - return ECMD_FAILED; + return EINVALID_CMD_LINE; } /*

1 0

master - tests: restore disable_dev behavior
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9c4953df1b5b2e2e… Commit: 9c4953df1b5b2e2e509f6f89598a733d5d580f2b Parent: 8db67d2aff7757d022f7d339451aeb93b0374311 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 16:59:38 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 16:59:38 2014 +0200 tests: restore disable_dev behavior Notify needs to go with major:minor before device disappears. --- test/lib/aux.sh | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index e422fa0..01bc1ea 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -413,14 +413,9 @@ disable_dev() { min=$(($(stat -L --printf=0x%T "$dev"))) echo "Disabling device $dev ($maj:$min)" dmsetup remove -f "$dev" 2>/dev/null || true - done - finish_udev_transaction - - for dev in "$@"; do - maj=$(($(stat -L --printf=0x%t "$dev"))) - min=$(($(stat -L --printf=0x%T "$dev"))) notify_lvmetad --major "$maj" --minor "$min" done + finish_udev_transaction } enable_dev() {

1 0

master - tests: skips on unsupported systems
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8db67d2aff7757d0… Commit: 8db67d2aff7757d022f7d339451aeb93b0374311 Parent: 092659644a6da359272b852d6be058a5fc26bff4 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 16:48:06 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 16:48:06 2014 +0200 tests: skips on unsupported systems --- test/shell/profiles-thin.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/test/shell/profiles-thin.sh b/test/shell/profiles-thin.sh index 1056528..25c12eb 100644 --- a/test/shell/profiles-thin.sh +++ b/test/shell/profiles-thin.sh @@ -17,10 +17,13 @@ DEV_SIZE=32 +# check we have thinp support compiled in +aux have_thin 1 0 0 || skip + aux prepare_profiles "thin-performance" # Create scsi debug dev with sector size of 4096B and 1MiB optimal_io_size -aux prepare_scsi_debug_dev $DEV_SIZE sector_size=4096 opt_blks=256 +aux prepare_scsi_debug_dev $DEV_SIZE sector_size=4096 opt_blks=256 || skip aux prepare_pvs 1 $DEV_SIZE vgcreate $vg "$dev1"

1 0

master - man: missing space between option name and value name
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=092659644a6da359… Commit: 092659644a6da359272b852d6be058a5fc26bff4 Parent: e78092fa3a4cba95ccc8820fb2b2c617e2b0f618 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed May 21 15:51:28 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 15:51:28 2014 +0200 man: missing space between option name and value name --- man/lvchange.8.in | 2 +- man/lvcreate.8.in | 2 +- man/lvm.8.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/man/lvchange.8.in b/man/lvchange.8.in index 56a35af..09f54e6 100644 --- a/man/lvchange.8.in +++ b/man/lvchange.8.in @@ -125,7 +125,7 @@ and copied to the others, so this can take a considerable amount of time - and during this time you are without a complete redundant copy of your data. .TP -.B \-\-metadataprofile \fIProfileName +.B \-\-metadataprofile " " \fIProfileName Uses and attaches ProfileName configuration profile to the logical volume metadata. Whenever the logical volume is processed next time, the profile is automatically applied. If the volume group has another diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in index 78cef80..ee50587 100644 --- a/man/lvcreate.8.in +++ b/man/lvcreate.8.in @@ -284,7 +284,7 @@ will create a persistent log that is itself mirrored. When the legacy "mirror" segment type is used, the optional argument \fB\-\-corelog\fP is equivalent to \fB\-\-mirrorlog\fP \fIcore\fP. .TP -.BR \-\-metadataprofile \fIProfileName +.BR \-\-metadataprofile " " \fIProfileName Uses and attaches the ProfileName configuration profile to the logical volume metadata. Whenever the logical volume is processed next time, the profile is automatically applied. If the volume group has another diff --git a/man/lvm.8.in b/man/lvm.8.in index c753561..9df3cde 100644 --- a/man/lvm.8.in +++ b/man/lvm.8.in @@ -281,12 +281,12 @@ an allocation request but \fInormal\fP doesn't use them, \fIanywhere\fP will - even if that reduces performance by placing two stripes on the same Physical Volume. .TP -.IR \fB\-\-commandprofile \fIProfileName +.IR \fB\-\-commandprofile " " \fIProfileName Selects the command configuration profile to use when processing an LVM command. See also \fBlvm.conf\fP(5) for more information about \fBcommand profile config\fP and the way it fits with other LVM configuration methods. .TP -.IR \fB\-\-metadataprofile \fIProfileName +.IR \fB\-\-metadataprofile " " \fIProfileName Selects the metadata configuration profile to use when processing an LVM command. When using metadata profile during Volume Group or Logical Volume creation, the metadata profile name is saved in metadata. When such Volume Group or Logical @@ -295,7 +295,7 @@ and the use of \-\-metadataprofile option is not necessary. See also \fBlvm.conf\fP(5) for more information about \fBmetadata profile config\fP and the way it fits with other LVM configuration methods. .TP -.IR \fB\-\-profile \fIProfileName +.IR \fB\-\-profile " " \fIProfileName A short form of \fB\-\-metadataprofile\fP for \fBvgcreate\fP, \fBlvcreate\fP, \fBvgchange\fP and \fBlvchange\fP command and a short form of \fB\-\-commandprofile\fP for any other command (with the exception of \fBdumpconfig\fP command where the

1 0

master - man: more man page updates for --commandprofile and --metadataprofile split
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e78092fa3a4cba95… Commit: e78092fa3a4cba95ccc8820fb2b2c617e2b0f618 Parent: b7431f69ed0e8b3b153b5c5dc1e3fbf990d059b0 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed May 21 14:53:56 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 14:53:56 2014 +0200 man: more man page updates for --commandprofile and --metadataprofile split --- man/lvchange.8.in | 19 ++++++++++++++----- man/lvconvert.8.in | 20 ++++++++++++++++++++ man/lvcreate.8.in | 15 +++++++++++++++ man/lvdisplay.8.in | 4 ++++ man/lvextend.8.in | 2 ++ man/lvm.8.in | 26 ++++++++++++++++++-------- man/lvm.conf.5.in | 4 ++-- man/lvmdiskscan.8.in | 2 ++ man/lvreduce.8.in | 2 ++ man/lvremove.8.in | 2 ++ man/lvrename.8.in | 2 ++ man/lvresize.8.in | 2 ++ man/lvs.8.in | 2 ++ man/lvscan.8.in | 2 ++ man/pvchange.8.in | 2 ++ man/pvck.8.in | 2 ++ man/pvcreate.8.in | 2 ++ man/pvdisplay.8.in | 4 ++++ man/pvmove.8.in | 2 ++ man/pvremove.8.in | 2 ++ man/pvresize.8.in | 2 ++ man/pvs.8.in | 2 ++ man/pvscan.8.in | 2 ++ man/vgcfgbackup.8.in | 2 ++ man/vgcfgrestore.8.in | 2 ++ man/vgchange.8.in | 19 ++++++++++++++----- man/vgck.8.in | 2 ++ man/vgconvert.8.in | 2 ++ man/vgcreate.8.in | 11 +++++++++++ man/vgdisplay.8.in | 4 ++++ man/vgexport.8.in | 2 ++ man/vgextend.8.in | 2 ++ man/vgmerge.8.in | 2 ++ man/vgmknodes.8.in | 2 ++ man/vgreduce.8.in | 2 ++ man/vgremove.8.in | 2 ++ man/vgrename.8.in | 2 ++ man/vgs.8.in | 2 ++ man/vgscan.8.in | 2 ++ man/vgsplit.8.in | 2 ++ 40 files changed, 166 insertions(+), 20 deletions(-) diff --git a/man/lvchange.8.in b/man/lvchange.8.in index b138c3d..56a35af 100644 --- a/man/lvchange.8.in +++ b/man/lvchange.8.in @@ -13,13 +13,13 @@ lvchange \- change attributes of a logical volume .RB [ \-K | \-\-ignoreactivationskip ] .RB [ \-\-alloc .IR AllocationPolicy ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-C | \-\-contiguous .RI { y | n }] .RB [ \-d | \-\-debug ] .RB [ \-\-deltag .IR Tag ] -.RB [ \-\-profile -.IR ProfileName ] .RB [ \-\-detachprofile ] .RB [ \-\-discards .RI { ignore | nopassdown | passdown }] @@ -44,6 +44,8 @@ lvchange \- change attributes of a logical volume .IR PhysicalVolume [ : { t | n | y }]] .RB [ \-\-sysinit ] .RB [ \-\-noudevsync ] +.RB [ \-\-metadataprofile +.IR ProfileName ] .RB [ \-M | \-\-persistent .RI { y | n }] .RB [ \-\-minor @@ -103,9 +105,9 @@ logical volume's allocation policy to contiguous, if all of the allocated physical extents are already contiguous. .TP .BR \-\-detachprofile -Detach any configuration profiles attached to given Logical Volumes. -See also \fBlvm\fP(8) and \fBlvm.conf\fP(5) for more -information about configuration profiles. +Detach any metadata configuration profiles attached to given +Logical Volumes. See \fBlvm.conf\fP(5) for more information +about \fBmetadata profiles\fP. .TP .BR \-\-discards " {" \fIignore | \fInopassdown | \fIpassdown } Set this to \fIignore\fP to ignore any discards received by a @@ -123,6 +125,13 @@ and copied to the others, so this can take a considerable amount of time - and during this time you are without a complete redundant copy of your data. .TP +.B \-\-metadataprofile \fIProfileName +Uses and attaches ProfileName configuration profile to the logical +volume metadata. Whenever the logical volume is processed next time, +the profile is automatically applied. If the volume group has another +profile attached, the logical volume profile is preferred. +See \fBlvm.conf\fP(5) for more information about \fBmetadata profiles\fP. +.TP .B \-\-minor \fIminor Set the minor number. .TP diff --git a/man/lvconvert.8.in b/man/lvconvert.8.in index 91c5bee..2833f20 100644 --- a/man/lvconvert.8.in +++ b/man/lvconvert.8.in @@ -15,6 +15,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .RB [ \-A | \-\-alloc .IR AllocationPolicy ] .RB [ \-b | \-\-background ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-f | \-\-force ] .RB [ \-i | \-\-interval .IR Seconds ] @@ -31,6 +33,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .RI [ PhysicalVolume [ Path ][ :PE [ -PE ]]...] .sp .B lvconvert \-\-splitmirrors \fIImages +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-\-name .IR SplitLogicalVolumeName ] .RB [ \-\-trackchanges ] @@ -39,6 +43,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .sp .B lvconvert .BR \-\-splitsnapshot +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-noudevsync ] .RB [ \-v | \-\-verbose ] @@ -47,6 +53,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .sp .B lvconvert .BR \-s | \-\-snapshot +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-c | \-\-chunksize .IR ChunkSize [ bBsSkK ]] .RB [ \-h | \-? | \-\-help ] @@ -59,6 +67,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .IR SnapshotLogicalVolume [ Path ] .sp .B lvconvert \-\-merge +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-b | \-\-background ] .RB [ \-i | \-\-interval .IR Seconds ] @@ -68,6 +78,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .IR LogicalVolume [ Path ]... .sp .B lvconvert \-\-repair +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-stripes .I Stripes @@ -79,6 +91,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .RI [ PhysicalVolume [ Path ]...] .sp .B lvconvert \-\-replace \fIPhysicalVolume +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-h | \-? | \-\-help ] .RB [ \-v | \-\-verbose ] .RB [ \-\-version ] @@ -87,6 +101,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .sp .B lvconvert \-\-thinpool .IR ThinPoolLogicalVolume { Name | Path } +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-c | \-\-chunksize .IR ChunkSize [ bBsSkKmMgG ]] .RB [ \-\-discards @@ -114,6 +130,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .RB [ \-\-version ] .sp .B lvconvert \-\-type \fIcache-pool +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-c | \-\-chunksize .IR ChunkSize [ bBsSkKmMgG ]] .RB [ \-\-cachemode @@ -133,6 +151,8 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .B \-\-cachepool .IR CachePoolLV { Name | Path } .IR LogicalVolume [ Path ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-h | \-? | \-\-help ] .RB [ \-v | \-\-verbose ] .RB [ \-\-version ] diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in index 4e7612a..78cef80 100644 --- a/man/lvcreate.8.in +++ b/man/lvcreate.8.in @@ -14,12 +14,16 @@ lvcreate \- create a logical volume in an existing volume group .RB [ \-K | \-\-ignoreactivationskip ] .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-C | \-\-contiguous .RI { y | n }] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-noudevsync ] .RB [ \-\-ignoremonitoring ] +.RB [ \-\-metadataprofile +.IR ProfileName ] .RB [ \-\-monitor .RI { y | n }] .RB [ \-\-[raid]maxrecoveryrate @@ -92,8 +96,12 @@ lvcreate \- create a logical volume in an existing volume group .IR LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]] .RB [ \-c | \-\-chunksize .IR ChunkSize [ bBsSkK ]] +.RB [ \-\-commandprofile +.IR Profilename ] .RB [ \-\-noudevsync ] .RB [ \-\-ignoremonitoring ] +.RB [ \-\-metadataProfile +.IR ProfileName ] .RB [ \-\-monitor .RI { y | n }] .RB [ \-n | \-\-name @@ -276,6 +284,13 @@ will create a persistent log that is itself mirrored. When the legacy "mirror" segment type is used, the optional argument \fB\-\-corelog\fP is equivalent to \fB\-\-mirrorlog\fP \fIcore\fP. .TP +.BR \-\-metadataprofile \fIProfileName +Uses and attaches the ProfileName configuration profile to the logical +volume metadata. Whenever the logical volume is processed next time, +the profile is automatically applied. If the volume group has another +profile attached, the logical volume profile is preferred. +See \fBlvm.conf\fP(5) for more information about \fBmetadata profiles\fP. +.TP .IR \fB\-M ", " \fB\-\-persistent " {" y | n } Set to \fIy\fP to make the minor number specified persistent. .TP diff --git a/man/lvdisplay.8.in b/man/lvdisplay.8.in index 8348879..a9f3d49 100644 --- a/man/lvdisplay.8.in +++ b/man/lvdisplay.8.in @@ -5,6 +5,8 @@ lvdisplay \- display attributes of a logical volume .B lvdisplay .RB [ \-a | \-\-all ] .RB [ \-c | \-\-colon ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] @@ -24,6 +26,8 @@ lvdisplay \- display attributes of a logical volume .BR \-C | \-\-columns .RB [ \-\-aligned ] .RB [ \-a | \-\-all ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/lvextend.8.in b/man/lvextend.8.in index d9bc0c8..845a3ea 100644 --- a/man/lvextend.8.in +++ b/man/lvextend.8.in @@ -7,6 +7,8 @@ lvextend \- extend the size of a logical volume .IR AllocationPolicy ] .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-f | \-\-force ] diff --git a/man/lvm.8.in b/man/lvm.8.in index 41223b0..c753561 100644 --- a/man/lvm.8.in +++ b/man/lvm.8.in @@ -281,16 +281,26 @@ an allocation request but \fInormal\fP doesn't use them, \fIanywhere\fP will - even if that reduces performance by placing two stripes on the same Physical Volume. .TP -.IR \fB\-\-profile \ ProfileName -Selects the configuration profile to use when processing an LVM command. -In addition to that, when creating a Volume Group or a Logical Volume, -it causes the ProfileName to be stored in metadata for each Volume Group -or Logical Volume. If the profile is stored in metadata, it is automatically -applied next time the Volume Group or the Logical Volume is processed and the -use of --profile is not necessary when running LVM commands further. See also -\fBlvm.conf\fP(5) for more information about \fBprofile config\fP and the +.IR \fB\-\-commandprofile \fIProfileName +Selects the command configuration profile to use when processing an LVM command. +See also \fBlvm.conf\fP(5) for more information about \fBcommand profile config\fP and +the way it fits with other LVM configuration methods. +.TP +.IR \fB\-\-metadataprofile \fIProfileName +Selects the metadata configuration profile to use when processing an LVM command. +When using metadata profile during Volume Group or Logical Volume creation, +the metadata profile name is saved in metadata. When such Volume Group or Logical +Volume is processed next time, the metadata profile is automatically applied +and the use of \-\-metadataprofile option is not necessary. See also +\fBlvm.conf\fP(5) for more information about \fBmetadata profile config\fP and the way it fits with other LVM configuration methods. .TP +.IR \fB\-\-profile \fIProfileName +A short form of \fB\-\-metadataprofile\fP for \fBvgcreate\fP, \fBlvcreate\fP, +\fBvgchange\fP and \fBlvchange\fP command and a short form of \fB\-\-commandprofile\fP +for any other command (with the exception of \fBdumpconfig\fP command where the +\-\-profile has special meaning, see \fBlvm dumpconfig\fP(8) for more information). +.TP .IR \fB\-\-config \ ConfigurationString Uses the ConfigurationString as direct string representation of the configuration to override the existing configuration. The ConfigurationString is of exactly diff --git a/man/lvm.conf.5.in b/man/lvm.conf.5.in index e64e2a3..bf73a29 100644 --- a/man/lvm.conf.5.in +++ b/man/lvm.conf.5.in @@ -47,7 +47,7 @@ any of its Logical Volumes have different profiles defined, the profile defined for the Logical Volume is preferred. The metadata profile can be attached/detached by using the \fBlvchange\fP and \fBvgchange\fP commands and their \fB\-\-metadataprofile ProfileName\fP and -\fB\-\-detachprofile ProfileName\fP options or the \fB\-\-metadataprofile\fP +\fB\-\-detachprofile\fP options or the \fB\-\-metadataprofile\fP option during creation when using \fBvgcreate\fP or \fBlvcreate\fP command. The \fBvgs\fP and \fBlvs\fP reporting commands provide \fB-o vg_profile\fP and \fB-o lv_profile\fP output options to show the metadata profile @@ -64,7 +64,7 @@ For this purpose, there's the \fBcommand_profile_template.profile\fP (for command profiles) and \fBmetadata_profile_template.profile\fP (for metadata profiles) which contain all settings that are customizable by profiles of certain type. Users are encouraged to copy these template -profiles and edit it as needed. Alternatively, the +profiles and edit them as needed. Alternatively, the \fBlvm dumpconfig --file <ProfileName.profile> --type profilable-command <section>\fP or \fBlvm dumpconfig --file <ProfileName.profile> --type profilable-metadata <section>\fP can be used to generate a configuration with profilable settings in either diff --git a/man/lvmdiskscan.8.in b/man/lvmdiskscan.8.in index 7b3e08b..c35d071 100644 --- a/man/lvmdiskscan.8.in +++ b/man/lvmdiskscan.8.in @@ -3,6 +3,8 @@ lvmdiskscan \- scan for all devices visible to LVM2 .SH SYNOPSIS .B lvmdiskscan +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-l | \-\-lvmpartition ] diff --git a/man/lvreduce.8.in b/man/lvreduce.8.in index 2b0f3f8..852ef0b 100644 --- a/man/lvreduce.8.in +++ b/man/lvreduce.8.in @@ -5,6 +5,8 @@ lvreduce \- reduce the size of a logical volume .B lvreduce .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/lvremove.8.in b/man/lvremove.8.in index 1d48a11..245b6e6 100644 --- a/man/lvremove.8.in +++ b/man/lvremove.8.in @@ -5,6 +5,8 @@ lvremove \- remove a logical volume .B lvremove .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/lvrename.8.in b/man/lvrename.8.in index ea640ae..b299fa2 100644 --- a/man/lvrename.8.in +++ b/man/lvrename.8.in @@ -5,6 +5,8 @@ lvrename \- rename a logical volume .B lvrename .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/lvresize.8.in b/man/lvresize.8.in index 75d20a0..52f9e38 100644 --- a/man/lvresize.8.in +++ b/man/lvresize.8.in @@ -5,6 +5,8 @@ lvresize \- resize a logical volume .B lvresize .RB [ \-\-alloc " " \fIAllocationPolicy ] .RB [ \-\-noudevsync ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-i | \-\-stripes " " \fIStripes .RB [ \-I | \-\-stripesize " " \fIStripeSize ]] .RB {[ \-l | \-\-extents diff --git a/man/lvs.8.in b/man/lvs.8.in index 7297ee9..43d79d8 100644 --- a/man/lvs.8.in +++ b/man/lvs.8.in @@ -5,6 +5,8 @@ lvs \- report information about logical volumes .B lvs .RB [ \-\-aligned ] .RB [ \-a | \-\-all ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/lvscan.8.in b/man/lvscan.8.in index 5102691..001f544 100644 --- a/man/lvscan.8.in +++ b/man/lvscan.8.in @@ -5,6 +5,8 @@ lvscan \- scan (all disks) for Logical Volumes .B lvscan .RB [ \-a | \-\-all] .RB [ \-b | \-\-blockdevice ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/pvchange.8.in b/man/pvchange.8.in index 5e6c15e..6fe3e3d 100644 --- a/man/pvchange.8.in +++ b/man/pvchange.8.in @@ -7,6 +7,8 @@ pvchange \- change attributes of a physical volume .IR Tag ] .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-f | \-\-force ] .RB [ \-\-deltag diff --git a/man/pvck.8.in b/man/pvck.8.in index e6019af..4308196 100644 --- a/man/pvck.8.in +++ b/man/pvck.8.in @@ -3,6 +3,8 @@ pvck \- check physical volume metadata .SH SYNOPSIS .B pvck +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-v | \-\-verbose ] diff --git a/man/pvcreate.8.in b/man/pvcreate.8.in index 9353c6c..76a0abb 100644 --- a/man/pvcreate.8.in +++ b/man/pvcreate.8.in @@ -3,6 +3,8 @@ pvcreate \- initialize a disk or partition for use by LVM .SH SYNOPSIS .B pvcreate +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/pvdisplay.8.in b/man/pvdisplay.8.in index b2a2577..f317bcc 100644 --- a/man/pvdisplay.8.in +++ b/man/pvdisplay.8.in @@ -4,6 +4,8 @@ pvdisplay \- display attributes of a physical volume .SH SYNOPSIS .B pvdisplay .RB [ \-c | \-\-colon ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] @@ -25,6 +27,8 @@ pvdisplay \- display attributes of a physical volume .BR \-C | \-\-columns .RB [ \-\-aligned ] .RB [ \-a | \-\-all ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/pvmove.8.in b/man/pvmove.8.in index bb69547..39e6cbf 100644 --- a/man/pvmove.8.in +++ b/man/pvmove.8.in @@ -7,6 +7,8 @@ pvmove \- move physical extents .RB [ \-\-alloc .IR AllocationPolicy ] .RB [ \-b | \-\-background ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-i | \-\-interval diff --git a/man/pvremove.8.in b/man/pvremove.8.in index 5029228..abf1ca9 100644 --- a/man/pvremove.8.in +++ b/man/pvremove.8.in @@ -3,6 +3,8 @@ pvremove \- remove a physical volume .SH SYNOPSIS .B pvremove +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/pvresize.8.in b/man/pvresize.8.in index 59539b8..14e459c 100644 --- a/man/pvresize.8.in +++ b/man/pvresize.8.in @@ -3,6 +3,8 @@ pvresize \- resize a disk or partition in use by LVM2 .SH SYNOPSIS .B pvresize +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/pvs.8.in b/man/pvs.8.in index 67e395b..9f9cde8 100644 --- a/man/pvs.8.in +++ b/man/pvs.8.in @@ -5,6 +5,8 @@ pvs \- report information about physical volumes .B pvs .RB [ \-a | \-\-all ] .RB [ \-\-aligned ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/pvscan.8.in b/man/pvscan.8.in index 61b15d0..19ca3fc 100644 --- a/man/pvscan.8.in +++ b/man/pvscan.8.in @@ -3,6 +3,8 @@ pvscan \- scan all disks for physical volumes .SH SYNOPSIS .B pvscan +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-v | \-\-verbose ] diff --git a/man/vgcfgbackup.8.in b/man/vgcfgbackup.8.in index ce8db8b..2bfebc6 100644 --- a/man/vgcfgbackup.8.in +++ b/man/vgcfgbackup.8.in @@ -3,6 +3,8 @@ vgcfgbackup \- backup volume group descriptor area .SH SYNOPSIS .B vgcfgbackup +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-f | \-\-file .RI < filename >] diff --git a/man/vgcfgrestore.8.in b/man/vgcfgrestore.8.in index ac84300..752fc56 100644 --- a/man/vgcfgrestore.8.in +++ b/man/vgcfgrestore.8.in @@ -3,6 +3,8 @@ vgcfgrestore \- restore volume group descriptor area .SH SYNOPSIS .B vgcfgrestore +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-f | \-\-file .RI < filename >] diff --git a/man/vgchange.8.in b/man/vgchange.8.in index 16adf4df..d756811 100644 --- a/man/vgchange.8.in +++ b/man/vgchange.8.in @@ -20,11 +20,11 @@ vgchange \- change attributes of a volume group .RB [ \-c | \-\-clustered .RI { y | n }] .RB [ \-u | \-\-uuid ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-\-deltag .IR Tag ] -.RB [ \-\-profile -.IR ProfileName ] .RB [ \-\-detachprofile ] .RB [ \-h | \-\-help ] .RB [ \-\-ignorelockingfailure ] @@ -36,6 +36,8 @@ vgchange \- change attributes of a volume group .IR MaxLogicalVolumes ] .RB [ -p | \-\-maxphysicalvolumes .IR MaxPhysicalVolumes ] +.RB [ \-\-metadataprofile +.IR ProfileName ] .RB [ \-\- [ vg ] metadatacopies ] .IR NumberOfCopies | unmanaged | all ] .RB [ \-P | \-\-partial ] @@ -99,9 +101,9 @@ particular time, you may still be able to use Volume Groups that are not marked as clustered. .TP .BR \-\-detachprofile -Detach any configuration profiles attached to given Volume Groups. -See also \fBlvm\fP(8) and \fBlvm.conf\fP(5) for more -information about configuration profiles. +Detach any metadata configuration profiles attached to given +Volume Groups. See \fBlvm.conf\fP(5) for more information +about \fBmetadata profiles\fP. .TP .BR \-u ", " \-\-uuid Generate new random UUID for specified Volume Groups. @@ -169,6 +171,13 @@ a volume group with metadata in lvm2 format, for tool performance reasons, you should consider some use of \fB--pvmetadatacopies 0\fP as described in \fBpvcreate(8)\fP, and/or use \fB--vgmetadatacopies\fP. .TP +.BR \-\-metadataprofile " " \fIProfileName +Uses and attaches ProfileName configuration profile to the volume group +metadata. Whenever the volume group is processed next time, the profile +is automatically applied. The profile is inherited by all logical volumes +in the volume group unless the logical volume itself has its own profile +attached. See \fBlvm.conf\fP(5) for more information about \fBmetadata profiles\fP. +.TP .BR \-\- [ vg ] metadatacopies " " \fINumberOfCopies | \fIunmanaged | \fIall Sets the desired number of metadata copies in the volume group. If set to a non-zero value, LVM will automatically manage the 'metadataignore' diff --git a/man/vgck.8.in b/man/vgck.8.in index cc6cd57..56cbdb0 100644 --- a/man/vgck.8.in +++ b/man/vgck.8.in @@ -3,6 +3,8 @@ vgck \- check volume group metadata .SH SYNOPSIS .B vgck +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-v | \-\-verbose ] diff --git a/man/vgconvert.8.in b/man/vgconvert.8.in index 1e182b6..c77d529 100644 --- a/man/vgconvert.8.in +++ b/man/vgconvert.8.in @@ -3,6 +3,8 @@ vgconvert \- convert volume group metadata format .SH SYNOPSIS .B vgconvert +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/vgcreate.8.in b/man/vgcreate.8.in index e62df9e..a2340d3 100644 --- a/man/vgcreate.8.in +++ b/man/vgcreate.8.in @@ -11,12 +11,16 @@ vgcreate \- create a volume group .RI { y | n }] .RB [ \-c | \-\-clustered .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-l | \-\-maxlogicalvolumes .IR MaxLogicalVolumes ] .RB [ -M | \-\-metadatatype .IR type ] +.RB [ \-\-metadataprofile +.IR ProfileName ] .RB [ -p | \-\-maxphysicalvolumes .IR MaxPhysicalVolumes ] .RB [ \-\- [ vg ] metadatacopies @@ -91,6 +95,13 @@ large numbers of physical volumes with metadata as it may be used to minimize metadata read and write overhead. The default value is \fIunmanaged\fP. .TP +.BR \-\-metadataprofile " " \fIProfileName +Uses and attaches the ProfileName configuration profile to the volume group +metadata. Whenever the volume group is processed next time, the profile is +automatically applied. The profile is inherited by all logical volumes in +the volume group unless the logical volume itself has its own profile attached. +See \fBlvm.conf\fP(5) for more information about \fBmetadata profiles\fP. +.TP .BR \-s ", " \-\-physicalextentsize " " \fIPhysicalExtentSize [ \fIbBsSkKmMgGtTpPeE ] Sets the physical extent size on physical volumes of this volume group. A size suffix (k for kilobytes up to t for terabytes) is optional, megabytes diff --git a/man/vgdisplay.8.in b/man/vgdisplay.8.in index 7f50f83..bb2ead7 100644 --- a/man/vgdisplay.8.in +++ b/man/vgdisplay.8.in @@ -5,6 +5,8 @@ vgdisplay \- display attributes of volume groups .B vgdisplay .RB [ \-A | \-\-activevolumegroups ] .RB [ \-c | \-\-colon ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-s | \-\-short ] .RB [ \-v | \-\-verbose ] .RB [ \-d | \-\-debug ] @@ -24,6 +26,8 @@ vgdisplay \- display attributes of volume groups .B vgdisplay .BR \-C | \-\-columns .RB [ \-\-aligned ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/vgexport.8.in b/man/vgexport.8.in index 7509170..2b31618 100644 --- a/man/vgexport.8.in +++ b/man/vgexport.8.in @@ -4,6 +4,8 @@ vgexport \- make volume groups unknown to the system .SH SYNOPSIS .B vgexport .RB [ \-a | \-\-all ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-v | \-\-verbose ] diff --git a/man/vgextend.8.in b/man/vgextend.8.in index ebb642f..ae7291c 100644 --- a/man/vgextend.8.in +++ b/man/vgextend.8.in @@ -5,6 +5,8 @@ vgextend \- add physical volumes to a volume group .B vgextend .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-restoremissing ] diff --git a/man/vgmerge.8.in b/man/vgmerge.8.in index 70db295..f67cffb 100644 --- a/man/vgmerge.8.in +++ b/man/vgmerge.8.in @@ -5,6 +5,8 @@ vgmerge \- merge two volume groups .B vgmerge .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-l | \-\-list ] diff --git a/man/vgmknodes.8.in b/man/vgmknodes.8.in index a0d9583..54fd3ec 100644 --- a/man/vgmknodes.8.in +++ b/man/vgmknodes.8.in @@ -3,6 +3,8 @@ vgmknodes \- recreate volume group directory and logical volume special files .SH SYNOPSIS .B vgmknodes +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-\-refresh ] diff --git a/man/vgreduce.8.in b/man/vgreduce.8.in index 734f01e..141533e 100644 --- a/man/vgreduce.8.in +++ b/man/vgreduce.8.in @@ -6,6 +6,8 @@ vgreduce \- reduce a volume group .RB [ \-a | \-\-all ] .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-removemissing ] diff --git a/man/vgremove.8.in b/man/vgremove.8.in index c205e8a..d17db10 100644 --- a/man/vgremove.8.in +++ b/man/vgremove.8.in @@ -3,6 +3,8 @@ vgremove \- remove a volume group .SH SYNOPSIS .B vgremove +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-f | \-\-force ] .RB [ \-h | \-? | \-\-help ] diff --git a/man/vgrename.8.in b/man/vgrename.8.in index 379f697..6951fb0 100644 --- a/man/vgrename.8.in +++ b/man/vgrename.8.in @@ -5,6 +5,8 @@ vgrename \- rename a volume group .B vgrename .RB [ \-A | \-\-autobackup .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-t | \-\-test ] diff --git a/man/vgs.8.in b/man/vgs.8.in index eae60fa..c32195b 100644 --- a/man/vgs.8.in +++ b/man/vgs.8.in @@ -5,6 +5,8 @@ vgs \- report information about volume groups .B vgs .RB [ \-a | \-\-all ] .RB [ \-\-aligned ] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/vgscan.8.in b/man/vgscan.8.in index 1cdc8e1..c11b1ea 100644 --- a/man/vgscan.8.in +++ b/man/vgscan.8.in @@ -3,6 +3,8 @@ vgscan \- scan all disks for volume groups and rebuild caches .SH SYNOPSIS .B vgscan +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] diff --git a/man/vgsplit.8.in b/man/vgsplit.8.in index bdcfe3b..546d02f 100644 --- a/man/vgsplit.8.in +++ b/man/vgsplit.8.in @@ -9,6 +9,8 @@ vgsplit \- split a volume group into two .RI { y | n }] .RB [ \-c | \-\-clustered .RI { y | n }] +.RB [ \-\-commandprofile +.IR ProfileName ] .RB [ \-d | \-\-debug ] .RB [ \-h | \-\-help ] .RB [ \-l | \-\-maxlogicalvolumes

1 0

master - man: update lvm.conf man page for latest changes
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b7431f69ed0e8b3b… Commit: b7431f69ed0e8b3b153b5c5dc1e3fbf990d059b0 Parent: 23f9c45a1bd610c455eb24a1264c07b27cd89fd2 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed May 21 13:25:09 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 13:25:09 2014 +0200 man: update lvm.conf man page for latest changes --- man/lvm.conf.5.in | 90 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 55 insertions(+), 35 deletions(-) diff --git a/man/lvm.conf.5.in b/man/lvm.conf.5.in index 1bed3d9..e64e2a3 100644 --- a/man/lvm.conf.5.in +++ b/man/lvm.conf.5.in @@ -13,62 +13,82 @@ any have changed, all the files are reloaded. The settings defined in lvm.conf can be overridden by any of these extended configuration methods: .TP -.B tag config -.br -See \fBtags\fP configuration setting description below. +.B direct config override on command line +The \fB\-\-config ConfigurationString\fP command line option takes the +ConfigurationString as direct string representation of the configuration +to override the existing configuration. The ConfigurationString is of +exactly the same format as used in any LVM configuration file. .TP .B profile config .br A profile is a set of selected customizable configuration settings that are aimed to achieve a certain characteristics in various -environments or uses. Normally, the name of the profile should -reflect that environment or use. +environments or uses. It's used to override existing configuration. +Normally, the name of the profile should reflect that environment or use. + +There are two groups of profiles recognised: \fBcommand profiles\fP and +\fBmetadata profiles\fP. + +The \fBcommand profile\fP is used to override selected configuration +settings at global LVM command level - it is applied at the very beginning +of LVM command execution and it is used throughout the whole time of LVM +command execution. The command profile is applied by using the +\fB\-\-commandprofile ProfileName\fP command line option that is recognised by +all LVM2 commands. + +The \fBmetadata profile\fP is used to override selected configuration +settings at Volume Group/Logical Volume level - it is applied independently +for each Volume Group/Logical Volume that is being processed. As such, +each Volume Group/Logical Volume can store the profile name used +in its metadata so next time the Volume Group/Logical Volume is +processed, the profile is applied automatically. If Volume Group and +any of its Logical Volumes have different profiles defined, the profile +defined for the Logical Volume is preferred. The metadata profile can be +attached/detached by using the \fBlvchange\fP and \fBvgchange\fP commands +and their \fB\-\-metadataprofile ProfileName\fP and +\fB\-\-detachprofile ProfileName\fP options or the \fB\-\-metadataprofile\fP +option during creation when using \fBvgcreate\fP or \fBlvcreate\fP command. +The \fBvgs\fP and \fBlvs\fP reporting commands provide \fB-o vg_profile\fP +and \fB-o lv_profile\fP output options to show the metadata profile +currently attached to a Volume Group or a Logical Volume. + +The set of options allowed for command profiles is mutually exclusive +when compared to the set of options allowed for metadata profiles. The +settings that belong to either of these two sets can't be mixed together +and LVM tools will reject such profiles. LVM itself provides a few predefined configuration profiles. Users are allowed to add more profiles with different values if needed. -For this purpose, there's the \fBdefault.profile\fP which contains all -settings that are customizable by profiles. Users are encouraged -to copy this default profile and edit it as needed. Alternatively, -the \fBlvm dumpconfig --file <ProfileName.profile> --type profilable <section>\fP -can be used to generate a configuration with profilable settings for -given section and save it to new ProfileName.profile (if the section -is not specified, all profilable settings are reported). +For this purpose, there's the \fBcommand_profile_template.profile\fP +(for command profiles) and \fBmetadata_profile_template.profile\fP +(for metadata profiles) which contain all settings that are customizable +by profiles of certain type. Users are encouraged to copy these template +profiles and edit it as needed. Alternatively, the +\fBlvm dumpconfig --file <ProfileName.profile> --type profilable-command <section>\fP +or \fBlvm dumpconfig --file <ProfileName.profile> --type profilable-metadata <section>\fP +can be used to generate a configuration with profilable settings in either +of the type for given section and save it to new ProfileName.profile +(if the section is not specified, all profilable settings are reported). The profiles are stored in #DEFAULT_PROFILE_DIR# directory by default. -This location can be changed using the \fBconfig/profile_dir\fP setting. +This location can be changed by using the \fBconfig/profile_dir\fP setting. Each profile configuration is stored in \fBProfileName.profile\fP file in the profile directory. When referencing the profile, the \fB.profile\fP suffix is left out. -The profile to use can be defined for each LVM command using the \fB\-\-profile ProfileName\fP -command line option. When using a profile while creating Volume -Groups or Logical Volumes, the ProfileName is stored in Volume Group -metadata. When using such volumes later on, the profile is automatically -loaded and applied. If Volume Group and any of its Logical Volumes have different -profiles defined, the profile defined for the Logical Volume is used. Profiles -attached to Volume Groups or Logical Volumes can be changed or detached -using the \fBvgchange\fP(8) and \fBlvchange\fP(8) commands with \fB\-\-profile ProfileName\fP -or \fB\-\-detachprofile\fP options. For any other LVM command, the \fB\-\-profile ProfileName\fP -option causes the profile to be applied only temporarily during the command -execution for any existing Volume Group or Logical Volume. - -The \fBvgs\fP and \fBlvs\fP reporting commands provide \fB-o vg_profile\fP and -\fB-o lv_profile\fP output options to show the profile currently attached to a -Volume Group or a Logical Volume. - .TP -.B direct config override on command line -The \fB\-\-config ConfigurationString\fP command line option takes the -ConfigurationString as direct string representation of the configuration -to override the existing configuration. The ConfigurationString is of -exactly the same format as used in any LVM configuration file. +.B tag config +.br +See \fBtags\fP configuration setting description below. .LP When several configuration methods are used at the same time and when LVM looks for the value of a particular setting, it traverses this \fBconfig cascade\fP from left to right: -\fBdirect config override on command line\fP -> \fBprofile config\fP -> \fBtag config\fP -> \fBlvm.conf\fP. + +\fBdirect config override on command line\fP -> \fBcommand profile config\fP -> \fBmetadata profile config\fP -> \fBtag config\fP -> \fBlvm.conf\fP + No part of this cascade is compulsory. If there's no setting value found at the end of the cascade, a default value is used for that setting. Use \fBlvm dumpconfig\fP to check what settings are in use and what

1 0

master - profiles: remove default.profile and add {command, metadata}_profile_template.profile
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=23f9c45a1bd610c4… Commit: 23f9c45a1bd610c455eb24a1264c07b27cd89fd2 Parent: c34c33d9ba69f1458932e468caa10846ebb4e970 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed May 21 12:32:12 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 12:36:52 2014 +0200 profiles: remove default.profile and add {command,metadata}_profile_template.profile The "default.profile" name was misleading. It's actually a helper *template* that can be used for copying and further editing to create a new profile. Also, we have separate command and metadata profiles now so the templates are separated as well - we can't mix profile settings from one group with another - such profile is rejected by lvm tools. --- WHATS_NEW | 1 + conf/Makefile.in | 6 ++-- conf/command_profile_template.profile.in | 46 +++++++++++++++++++++++++ conf/default.profile.in | 53 ----------------------------- conf/metadata_profile_template.profile.in | 24 +++++++++++++ configure | 5 ++- configure.in | 3 +- spec/packages.inc | 3 +- 8 files changed, 81 insertions(+), 60 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 7f50eb1..61753d6 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Remove default.profile and add {command,metadata}_profile_template.profile. Use proper umask for systemd units generated by lvm2-activation-generator. Check for failing mirror_remove_missing() function. Prompt before converting volumes to thin pool and thin pool metadata. diff --git a/conf/Makefile.in b/conf/Makefile.in index 3f66621..54852e2 100644 --- a/conf/Makefile.in +++ b/conf/Makefile.in @@ -18,8 +18,8 @@ top_builddir = @top_builddir@ CONFSRC=example.conf CONFDEST=lvm.conf -DEFAULT_PROFILE=default.profile -PROFILES=$(DEFAULT_PROFILE) $(srcdir)/thin-performance.profile +PROFILE_TEMPLATES=command_profile_template.profile metadata_profile_template.profile +PROFILES=$(PROFILE_TEMPLATES) $(srcdir)/thin-performance.profile include $(top_builddir)/make.tmpl @@ -37,4 +37,4 @@ install_lvm2: install_conf install_profiles install: install_lvm2 -DISTCLEAN_TARGETS += $(CONFSRC) $(DEFAULT_PROFILE) +DISTCLEAN_TARGETS += $(CONFSRC) $(PROFILE_TEMPLATES) diff --git a/conf/command_profile_template.profile.in b/conf/command_profile_template.profile.in new file mode 100644 index 0000000..36d4343 --- /dev/null +++ b/conf/command_profile_template.profile.in @@ -0,0 +1,46 @@ +# This is a command profile template for the LVM2 system. +# +# It contains all configuration settings that are customizable by command +# profiles. To create a new command profile, select the settings you want +# to customize and add them in a new file named <profile_name>.profile. +# Then install the new profile in a directory as defined by config/profile_dir +# setting found in @DEFAULT_SYS_DIR@/lvm.conf file. +# +# Command profiles can be referenced by using the --commandprofile option then. +# +# Refer to 'man lvm.conf' for further information about profiles and +# general configuration file layout. +# +global { + units="h" + si_unit_consistency=1 + suffix=1 + lvdisplay_shows_full_device_path=0 +} +report { + aligned=1 + buffered=1 + headings=1 + separator=" " + prefixes=0 + quoted=1 + colums_as_rows=0 + devtypes_sort="devtype_name" + devtypes_cols="devtype_name,devtype_max_partitions,devtype_description" + devtypes_cols_verbose="devtype_name,devtype_max_partitions,devtype_description" + lvs_sort="vg_name,lv_name" + lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,metadata_percent,move_pv,mirror_log,copy_percent,convert_lv" + lvs_cols_verbose="lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile" + vgs_sort="vg_name" + vgs_cols="vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free" + vgs_cols_verbose="vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile" + pvs_sort="pv_name" + pvs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free" + pvs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid" + segs_sort="vg_name,lv_name,seg_start" + segs_cols="lv_name,vg_name,lv_attr,stripes,segtype,seg_size" + segs_cols_verbose="lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize" + pvsegs_sort="pv_name,pvseg_start" + pvsegs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size" + pvsegs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges" +} diff --git a/conf/default.profile.in b/conf/default.profile.in deleted file mode 100644 index cc0279b..0000000 --- a/conf/default.profile.in +++ /dev/null @@ -1,53 +0,0 @@ -# This is a default profile for the LVM2 system. -# It contains all configuration settings that are customizable by profiles. -# -# To create a new profile, select the settings you want to customize -# and put them in a new file named <profile_name>.profile. Then put this -# file in a directory as defined by config/profile_dir setting found in -# @DEFAULT_SYS_DIR@/lvm.conf file. -# -# Refer to 'man lvm.conf' for further information about profiles and file layout. - -allocation { - thin_pool_zero=1 - thin_pool_discards="passdown" - thin_pool_chunk_size_policy="generic" -# thin_pool_chunk_size=64 -} -global { - units="h" - si_unit_consistency=1 - suffix=1 - lvdisplay_shows_full_device_path=0 -} -activation { - thin_pool_autoextend_threshold=100 - thin_pool_autoextend_percent=20 -} -report { - aligned=1 - buffered=1 - headings=1 - separator=" " - prefixes=0 - quoted=1 - colums_as_rows=0 - devtypes_sort="devtype_name" - devtypes_cols="devtype_name,devtype_max_partitions,devtype_description" - devtypes_cols_verbose="devtype_name,devtype_max_partitions,devtype_description" - lvs_sort="vg_name,lv_name" - lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,move_pv,mirror_log,copy_percent,convert_lv" - lvs_cols_verbose="lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile" - vgs_sort="vg_name" - vgs_cols="vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free" - vgs_cols_verbose="vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile" - pvs_sort="pv_name" - pvs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free" - pvs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid" - segs_sort="vg_name,lv_name,seg_start" - segs_cols="lv_name,vg_name,lv_attr,stripes,segtype,seg_size" - segs_cols_verbose="lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize" - pvsegs_sort="pv_name,pvseg_start" - pvsegs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size" - pvsegs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges" -} diff --git a/conf/metadata_profile_template.profile.in b/conf/metadata_profile_template.profile.in new file mode 100644 index 0000000..81633b2 --- /dev/null +++ b/conf/metadata_profile_template.profile.in @@ -0,0 +1,24 @@ +# This is a metadata profile template for the LVM2 system. +# +# It contains all configuration settings that are customizable by metadata +# profiles. To create a new metadata profile, select the settings you want +# to customize and add them in a new file named <profile_name>.profile. +# Then install the new profile in a directory as defined by config/profile_dir +# setting found in @DEFAULT_SYS_DIR@/lvm.conf file. +# +# Metadata profiles can be referenced by using the --metadataprofile LVM2 +# command line option. +# +# Refer to 'man lvm.conf' for further information about profiles and +# general configuration file layout. +# +allocation { + thin_pool_zero=1 + thin_pool_discards="passdown" + thin_pool_chunk_size_policy="generic" +# thin_pool_chunk_size=64 +} +activation { + thin_pool_autoextend_threshold=100 + thin_pool_autoextend_percent=20 +} diff --git a/configure b/configure index dd5ec64..49a89c2 100755 --- a/configure +++ b/configure @@ -11530,7 +11530,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile conf/Makefile conf/example.conf conf/default.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.s h scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile conf/Makefile conf/example.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12241,7 +12241,8 @@ do "daemons/lvmetad/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmetad/Makefile" ;; "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;; "conf/example.conf") CONFIG_FILES="$CONFIG_FILES conf/example.conf" ;; - "conf/default.profile") CONFIG_FILES="$CONFIG_FILES conf/default.profile" ;; + "conf/command_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/command_profile_template.profile" ;; + "conf/metadata_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/metadata_profile_template.profile" ;; "include/.symlinks") CONFIG_FILES="$CONFIG_FILES include/.symlinks" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; diff --git a/configure.in b/configure.in index 3a8e5d9..6fbba27 100644 --- a/configure.in +++ b/configure.in @@ -1783,7 +1783,8 @@ daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile conf/Makefile conf/example.conf -conf/default.profile +conf/command_profile_template.profile +conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile diff --git a/spec/packages.inc b/spec/packages.inc index e70f6ad..4862430 100644 --- a/spec/packages.inc +++ b/spec/packages.inc @@ -148,7 +148,8 @@ fi %dir %{_sysconfdir}/lvm %ghost %{_sysconfdir}/lvm/cache/.cache %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/default.profile +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/command_profile_template.profile +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/metadata_profile_template.profile %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/thin-performance.profile %dir %{_sysconfdir}/lvm/backup %dir %{_sysconfdir}/lvm/cache

1 0

master - tests: notify loop needs maj:min
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c34c33d9ba69f145… Commit: c34c33d9ba69f1458932e468caa10846ebb4e970 Parent: cbdb8fa58925f64cf1da9de9ec00e878fe83c2d0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 12:00:32 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 12:00:32 2014 +0200 tests: notify loop needs maj:min Missed in previous commit. --- test/lib/aux.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 400a49d..e422fa0 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -417,6 +417,8 @@ disable_dev() { finish_udev_transaction for dev in "$@"; do + maj=$(($(stat -L --printf=0x%t "$dev"))) + min=$(($(stat -L --printf=0x%T "$dev"))) notify_lvmetad --major "$maj" --minor "$min" done }

1 0

master - tests: notify lvmetad after udev transation
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cbdb8fa58925f64c… Commit: cbdb8fa58925f64cf1da9de9ec00e878fe83c2d0 Parent: 97c91b020e234d40a43ccde9edc2e8f9a4c3bb2b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 11:40:34 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 11:43:24 2014 +0200 tests: notify lvmetad after udev transation Delay udev notification after the point udev transaction is finished - since otherwise some device may still be found missing until udev transaction is finished. --- test/lib/aux.sh | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 0832f24..400a49d 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -413,9 +413,12 @@ disable_dev() { min=$(($(stat -L --printf=0x%T "$dev"))) echo "Disabling device $dev ($maj:$min)" dmsetup remove -f "$dev" 2>/dev/null || true - notify_lvmetad --major "$maj" --minor "$min" done finish_udev_transaction + + for dev in "$@"; do + notify_lvmetad --major "$maj" --minor "$min" + done } enable_dev() { @@ -429,9 +432,12 @@ enable_dev() { dmsetup load "$name" "$name.table" # using device name (since device path does not exists yes with udev) dmsetup resume "$name" - notify_lvmetad "$dev" done finish_udev_transaction + + for dev in "$@"; do + notify_lvmetad "$dev" + done } # @@ -477,8 +483,8 @@ error_dev() { fi # using device name (since device path does not exists yet with udev) dmsetup resume "$name" - notify_lvmetad "$dev" finish_udev_transaction + notify_lvmetad "$dev" } backup_dev() {

1 0

master - man: update dumpconfig man page for latest changes
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=97c91b020e234d40… Commit: 97c91b020e234d40a43ccde9edc2e8f9a4c3bb2b Parent: 1ddc68ccd72036d00b6d89c1baa9fa544d093095 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed May 21 11:00:55 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 11:01:19 2014 +0200 man: update dumpconfig man page for latest changes --- man/lvm-dumpconfig.8.in | 60 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 51 insertions(+), 9 deletions(-) diff --git a/man/lvm-dumpconfig.8.in b/man/lvm-dumpconfig.8.in index e9fe84e..4b21ef1 100644 --- a/man/lvm-dumpconfig.8.in +++ b/man/lvm-dumpconfig.8.in @@ -6,11 +6,19 @@ lvm-dumpconfig \- dump LVM configuration .RB [ \-f | \-\-file ] .IR filename ] .RB [ \-\-type -.RI { current | default | diff | missing | new | profilable } +.RI { current | default | diff | missing | new | profilable | profilable-command | profilable-metadata } .RB [ \-\-atversion .IR version ] .RB [ \-\-ignoreadvanced ] .RB [ \-\-ignoreunsupported ] +.RB [ \-\-config +.IR ConfigurationString ] +.RB [ \-\-commandprofile +.IR ProfileName ] +.RB [ \-\-profile +.IR ProfileName ] +.RB [ \-\-metadataprofile +.IR ProfileName ] .RB [ \-\-mergedconfig ] .RB [ \-\-validate ] .RB [ \-\-withcomments ] @@ -55,6 +63,14 @@ or specific version as defined by \fB\-\-atversion\fP option. .IP profilable 3 Dump all profilable configuration settings with default values assigned. See \fBlvm.conf\fP(5) for more info about \fBprofile config\fP method. +.IP profilable-command 3 +Dump all profilable configuration settings with default values assigned +that can be used in command profile. This is a subset of settings dumped +by \fB\-\-type \-\-profilable\fP. +.IP profilable-metadata 3 +Dump all profilable configuration settings with default values assigned +that can be used in metadata profile. This is a subset of settings dumped +by \fB\-\-type \-\-profilable\fP. .RE .TP @@ -78,20 +94,46 @@ either used for debugging purposes only or their support is not yet complete and they are not meant to be used in production. .TP +.BI \-\-config " ConfigurationString" +Use \fBConfigurationString\fP to override existing configuration. +This configuration is then applied for dumpconfig command itself. +See also \fBlvm.conf\fP(5) for more info about \fBconfig cascade\fP. + +.TP +.BI \-\-commandprofile " ProfileName" +Use \fBProfileName\fP to override existing configuration. +This configuration is then applied for dumpconfig command itself. +See also \fBlvm.conf\fP(5) for more info about \fBconfig cascade\fP. + +.TP +.BI \-\-profile " ProfileName" +The same as using \fB\-\-commandprofile\fP but the configuration is not +applied for dumpconfig command itself. + +.TP +.BI \-\-metadataprofile " ProfileName" +Use \fBProfileName\fP to override existing configuration. +The configuration defined in metadata profile has no effect for +dumpconfig command itself, the dumpconfig dumps the configuration only. +See also \fBlvm.conf\fP(5) for more info about \fBconfig cascade\fP. + +.TP .B \-\-mergedconfig When the dumpconfig command is run with the \fB\-\-config\fP option -and/or \fB\-\-profile\fP option (common options that are recognized -by all LVM tools, see also \fBlvm\fP(8)), merge the \fB\-\-config\fP -and/or \fB\-\-profile\fP config with current configuration used -(see \fB\-\-type current\fP above). Otherwise, only the configuration -specified within \fB\-\-config\fP or \fB\-\-profile\fP option is dumped -(see also \fBlvm.conf\fP(5) for more info about \fBconfig cascade\fP). +and/or \fB\-\-commandprofile\fP, \fB\-\-profile\fP, \fB\-\-metadataprofile\fP +option, merge all the contents of the \fBconfig cascade\fP before dumping it. +Without the \fB\-\-mergeconfig\fP option used, only the configuration at +the front of the cascade is dumped. See also \fBlvm.conf\fP(5) for more +info about \fBconfig cascade\fP. .TP .B \-\-validate Validate current configuration used and exit with appropriate -return code. The validation is done even if \fBconfig/checks\fP -\fBlvm.conf\fP(5) option is disabled. +return code. The validation is done only for the configuration +at the front of the \fBconfig cascade\fP. To validate the whole +merged configuration tree, use also the \fB\-\-mergedconfig\fP option. +The validation is done even if \fBconfig/checks\fP \fBlvm.conf\fP(5) +option is disabled. .TP .B \-\-withcomments

1 0

master - man: call installers only when there are set vars.
by Zdenek Kabelac 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1ddc68ccd72036d0… Commit: 1ddc68ccd72036d00b6d89c1baa9fa544d093095 Parent: fca77a1ea4343ee6db18a36ffe15d6d4532ee6de Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 21 10:50:56 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 21 10:52:33 2014 +0200 man: call installers only when there are set vars. When MAN7, MAN8CLUSTER or MAN8SYSTEMD_GENERATORS would be empty, don't call respective INSTALL tools. On older systems they even generate error causing abort of makefile target. --- man/Makefile.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/man/Makefile.in b/man/Makefile.in index dd59555..15f0252 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -107,8 +107,10 @@ install_man5: $(MAN5) $(INSTALL_DATA) $(MAN5) $(MAN5DIR)/ install_man7: $(MAN7) +ifdef MAN7 $(INSTALL) -d $(MAN7DIR) $(INSTALL_DATA) $(MAN7) $(MAN7DIR)/ +endif install_man8: $(MAN8) $(INSTALL) -d $(MAN8DIR) @@ -117,15 +119,19 @@ install_man8: $(MAN8) install_lvm2: install_man5 install_man7 install_man8 install_cluster: $(MAN8CLUSTER) +ifdef MAN8CLUSTER $(INSTALL) -d $(MAN8DIR) $(INSTALL_DATA) $(MAN8CLUSTER) $(MAN8DIR)/ +endif install_device-mapper: $(MAN8DM) $(INSTALL) -d $(MAN8DIR) $(INSTALL_DATA) $(MAN8DM) $(MAN8DIR)/ install_systemd_generators: $(MAN8SYSTEMD_GENERATORS) +ifdef MAN8SYSTEMD_GENERATORS $(INSTALL) -d $(MAN8DIR) $(INSTALL_DATA) $(MAN8SYSTEMD_GENERATORS) $(MAN8DIR)/ +endif install: install_lvm2 install_device-mapper

1 0

master - cleanup: remove duplicate --commandprofile reference in dumpconfig's help string
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fca77a1ea4343ee6… Commit: fca77a1ea4343ee6db18a36ffe15d6d4532ee6de Parent: e9db11f387086787fb1aad5a853990e9e6034ad5 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed May 21 10:30:02 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 10:30:02 2014 +0200 cleanup: remove duplicate --commandprofile reference in dumpconfig's help string --- tools/commands.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/commands.h b/tools/commands.h index 50db8eb..0fa028d 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -57,7 +57,6 @@ xx(dumpconfig, "Dump configuration", PERMITTED_READ_ONLY, "dumpconfig\n" - "\t[--commandprofile ProfileName]\n" "\t[-f|--file filename] \n" "\t[--type {current|default|diff|missing|new|profilable|profilable-command|profilable-metadata} \n" "\t[--atversion version]] \n"

1 0

master - systemd: use umask 022 for generated systemd units by lvm2-activation-generator
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e9db11f387086787… Commit: e9db11f387086787fb1aad5a853990e9e6034ad5 Parent: 7d7c1f2025e73e729e53ddb9e09ce8097b532797 Author: Dongmao Zhang <dmzhang(a)suse.com> AuthorDate: Wed May 21 10:10:24 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 10:12:02 2014 +0200 systemd: use umask 022 for generated systemd units by lvm2-activation-generator --- WHATS_NEW | 1 + .../lvm2_activation_generator_systemd_red_hat.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 86ed3bc..7f50eb1 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Use proper umask for systemd units generated by lvm2-activation-generator. Check for failing mirror_remove_missing() function. Prompt before converting volumes to thin pool and thin pool metadata. Add dumpconfig --type profilable-{metadata,command} to select profile type. diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c index e39f901..6a003f5 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -170,6 +170,7 @@ int main(int argc, char *argv[]) { const char *dir; int r = EXIT_SUCCESS; + mode_t old_mask; kmsg_fd = open(KMSG_DEV_PATH, O_WRONLY|O_NOCTTY); @@ -184,10 +185,13 @@ int main(int argc, char *argv[]) dir = argv[1]; + /* mark lvm2-activation.*.service as world-accessible */ + old_mask = umask(0022); if (!generate_unit(dir, UNIT_EARLY) || !generate_unit(dir, UNIT_MAIN) || !generate_unit(dir, UNIT_NET)) r = EXIT_FAILURE; + umask(old_mask); out: if (r) kmsg(LOG_ERR, "LVM: Activation generator failed.\n");

1 0

master - systemd: install lvm2-cluster-activation script as executable
by Peter Rajnoha 21 May '14

21 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7d7c1f2025e73e72… Commit: 7d7c1f2025e73e729e53ddb9e09ce8097b532797 Parent: b57b4db88940566cb7df9368eb5520ebab1634a2 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed May 21 09:45:29 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed May 21 09:45:29 2014 +0200 systemd: install lvm2-cluster-activation script as executable --- scripts/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 2c92033..19fd5d8 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -115,7 +115,7 @@ endif ifneq ("@CLVMD@", "none") $(INSTALL_DATA) lvm2_clvmd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-clvmd.service $(INSTALL_DATA) lvm2_cluster_activation_systemd_red_hat.service $(systemd_unit_dir)/lvm2-cluster-activation.service - $(INSTALL_DATA) lvm2_cluster_activation_red_hat.sh $(systemd_dir)/lvm2-cluster-activation + $(INSTALL_SCRIPT) lvm2_cluster_activation_red_hat.sh $(systemd_dir)/lvm2-cluster-activation endif ifeq ("@BUILD_CMIRRORD@", "yes") $(INSTALL_DATA) lvm2_cmirrord_systemd_red_hat.service $(systemd_unit_dir)/lvm2-cmirrord.service

1 0

master - tests: checking mirror_remove_missing
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b57b4db88940566c… Commit: b57b4db88940566cb7df9368eb5520ebab1634a2 Parent: f919a255b7875db0049eb71e10a2638842541415 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 22:50:52 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 22:50:52 2014 +0200 tests: checking mirror_remove_missing FIXME: Seems like conversion of log is not supported in clustered VG and needs to be fixed. --- test/shell/lvconvert-repair-replace.sh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/shell/lvconvert-repair-replace.sh b/test/shell/lvconvert-repair-replace.sh index 53c0938..c02d2ac 100644 --- a/test/shell/lvconvert-repair-replace.sh +++ b/test/shell/lvconvert-repair-replace.sh @@ -51,10 +51,15 @@ check mirror $vg 2way aux enable_dev "$dev1" "$dev2" vgremove -ff $vg +# FIXME - exclusive activation for mirrors should work here +# conversion of inactive cluster logs is also unsupported +test -e LOCAL_CLVMD && exit 0 + + # Test repair of inactive mirror with log failure # Replacement should fail, but convert should succeed (switch to corelog) vgcreate $vg "$dev1" "$dev2" "$dev3" "$dev4" -lvcreate -aey --type mirror -m 2 --ignoremonitoring --nosync -l 2 -n mirror2 $vg "$dev1" "$dev2" "$dev3" "$dev4":0 +lvcreate -aey --type mirror -m 2 --ignoremonitoring -l 2 -n mirror2 $vg "$dev1" "$dev2" "$dev3" "$dev4":0 vgchange -a n $vg pvremove -ff -y "$dev4" lvconvert -y --repair $vg/mirror2 @@ -62,9 +67,6 @@ check mirror $vg mirror2 vgs $vg vgremove -ff $vg -# FIXME - exclusive activation for mirrors should work here -test -e LOCAL_CLVMD && exit 0 - if kernel_at_least 3 0 0; then # 2-way, mirrored log # Double log failure, full replace

1 0

master - tests: lvconvert needs --yes
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f919a255b7875db0… Commit: f919a255b7875db0049eb71e10a2638842541415 Parent: e538354e281c7b00667b3385878b4c32693359b5 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 22:50:33 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 22:50:33 2014 +0200 tests: lvconvert needs --yes --- test/shell/pvmove-cache-segtypes.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/shell/pvmove-cache-segtypes.sh b/test/shell/pvmove-cache-segtypes.sh index db3bde5..c9f2078 100644 --- a/test/shell/pvmove-cache-segtypes.sh +++ b/test/shell/pvmove-cache-segtypes.sh @@ -110,7 +110,7 @@ lvremove -ff $vg lvcreate -l 2 -n ${lv1}_foo $vg "$dev1" lvcreate --type raid1 -L 2M -n meta $vg "$dev1" "$dev2" lvcreate --type raid1 -L 4M -n ${lv1}_pool $vg "$dev1" "$dev2" -lvconvert --type cache-pool $vg/${lv1}_pool --poolmetadata $vg/meta +lvconvert --yes --type cache-pool $vg/${lv1}_pool --poolmetadata $vg/meta lvcreate --type cache -n $lv1 -L 8M $vg/${lv1}_pool "$dev5" check lv_tree_on $vg ${lv1}_foo "$dev1" @@ -142,7 +142,7 @@ lvcreate -l 2 -n ${lv1}_foo $vg "$dev1" # RAID for cachepool lvcreate --type raid1 -m 1 -L 2M -n meta $vg "$dev1" "$dev2" lvcreate --type raid1 -m 1 -L 4M -n cachepool $vg "$dev1" "$dev2" -lvconvert --type cache-pool $vg/cachepool --poolmetadata $vg/meta +lvconvert --yes --type cache-pool $vg/cachepool --poolmetadata $vg/meta # RAID for thin pool data LV lvcreate --type raid1 -m 1 -L 8 -n thinpool $vg "$dev3" "$dev4" # Convert thin pool data to a cached LV @@ -150,7 +150,7 @@ lvconvert --type cache $vg/thinpool --cachepool $vg/cachepool # Create simple thin pool meta lvcreate -L 2M -n meta $vg "$dev1" # Use thin pool data LV to build a thin pool -lvconvert --thinpool $vg/thinpool --poolmetadata $vg/meta +lvconvert --yes --thinpool $vg/thinpool --poolmetadata $vg/meta # Create a thin lv for fun lvcreate -T $vg/thinpool -V 20 -n thin_lv @@ -174,4 +174,4 @@ check lv_tree_on $vg thinpool "$dev3" "$dev4" "$dev5" # Move non-cache tmeta #check lv_tree_on $vg $vg/thinpool "$dev3" "$dev4" #check dev_md5sum $vg/thin_lv -lvremove -ff $vg \ No newline at end of file +lvremove -ff $vg

1 0

master - spec: configurable cache build
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e538354e281c7b00… Commit: e538354e281c7b00667b3385878b4c32693359b5 Parent: 08fd24450685abd935d744795a6c2fc5e819ef64 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 19:56:20 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:30 2014 +0200 spec: configurable cache build Install lvmcache man page when being configured with cache support. Install lvmthin man page only with thin support. --- spec/packages.inc | 8 ++++++-- spec/source.inc | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spec/packages.inc b/spec/packages.inc index 5999ab7..e70f6ad 100644 --- a/spec/packages.inc +++ b/spec/packages.inc @@ -82,9 +82,13 @@ fi %if %{have_service lvmetad} %{_sbindir}/lvmetad %endif +%if %{have_with cache} + %{_mandir}/man7/lvmcache.7.gz +%endif +%if %{have_with thin} + %{_mandir}/man7/lvmthin.7.gz +%endif %{_mandir}/man5/lvm.conf.5.gz -%{_mandir}/man7/lvmcache.7.gz -%{_mandir}/man7/lvmthin.7.gz %{_mandir}/man8/fsadm.8.gz %{_mandir}/man8/lvchange.8.gz %{_mandir}/man8/lvconvert.8.gz diff --git a/spec/source.inc b/spec/source.inc index 0a1c270..6ef4791 100644 --- a/spec/source.inc +++ b/spec/source.inc @@ -13,6 +13,7 @@ %with clvmd corosync # TODO %global req_dm_persistent device-mapper-persistent-data >= 0.1.4 +%with cache internal %with thin internal %with thin_check %{_sbindir}/thin_check %with thin_repair %{_sbindir}/thin_repair @@ -39,6 +40,7 @@ %endif %if %{fedora} == 16 +%with cache none %with thin none %with thin_check %with thin_repair

1 0

master - tests: rebuild paths when Makefile is updated
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=08fd24450685abd9… Commit: 08fd24450685abd935d744795a6c2fc5e819ef64 Parent: 2e9792121fa93e7cb67583cd2757dd52ab2825dc Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 21:27:43 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:30 2014 +0200 tests: rebuild paths when Makefile is updated --- test/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 33b7042..1538fa3 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -137,7 +137,7 @@ lib/%: $(srcdir)/lib/%.sh .lib-dir-stamp cp $< $@ chmod +x $@ -lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp +lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp Makefile $(RM) $@-t echo 'top_srcdir="$(top_srcdir)"' >> $@-t echo 'abs_top_builddir="$(abs_top_builddir)"' >> $@-t

1 0

master - tests: add have_cache and have_raid
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2e9792121fa93e7c… Commit: 2e9792121fa93e7cb67583cd2757dd52ab2825dc Parent: 7f92c3a13eeba179872dacd4b632d8bb5188a0ba Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 19:54:48 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:30 2014 +0200 tests: add have_cache and have_raid Need to be aware of build options, when system would be configure without raid or cache support --- test/Makefile.in | 2 ++ test/lib/aux.sh | 14 ++++++++++++-- test/shell/lvchange-partial-raid10.sh | 2 +- test/shell/lvchange-partial.sh | 2 +- test/shell/lvchange-raid.sh | 6 +++--- test/shell/lvchange-raid10.sh | 2 +- test/shell/lvchange-raid456.sh | 2 +- test/shell/lvconvert-raid.sh | 2 +- test/shell/lvconvert-raid10.sh | 2 +- test/shell/lvconvert-raid456.sh | 2 +- test/shell/lvconvert-repair-raid.sh | 2 +- test/shell/lvconvert-thin-external.sh | 2 +- test/shell/lvcreate-cache.sh | 2 +- test/shell/lvcreate-large-raid.sh | 2 +- test/shell/lvcreate-large-raid10.sh | 2 +- test/shell/lvcreate-raid.sh | 2 +- test/shell/lvcreate-raid10.sh | 2 +- test/shell/lvresize-raid.sh | 2 +- test/shell/lvresize-raid10.sh | 2 +- test/shell/pvmove-cache-segtypes.sh | 6 +++--- test/shell/pvmove-raid-segtypes.sh | 2 +- test/shell/pvmove-thin-segtypes.sh | 4 ++-- test/shell/pvremove-thin.sh | 2 +- test/shell/vgsplit-raid.sh | 2 +- 24 files changed, 41 insertions(+), 29 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 33d8ab4..33b7042 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -146,6 +146,8 @@ lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp echo 'abs_builddir="$(abs_builddir)"' >> $@-t echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t echo 'export THIN=@THIN@' >> $@-t + echo 'export RAID=@RAID@' >> $@-t + echo 'export CACHE=@CACHE@' >> $@-t echo 'export LVMETAD_PIDFILE="@LVMETAD_PIDFILE@"' >> $@-t echo 'export DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t echo 'export CLVMD_PIDFILE="@CLVMD_PIDFILE@"' >> $@-t diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 8b765e9..0832f24 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -770,13 +770,23 @@ target_at_least() { } have_thin() { - target_at_least dm-thin-pool "$@" || exit 1 - test "$THIN" = shared || test "$THIN" = internal || exit 1 + test "$THIN" = shared -o "$THIN" = internal || return 1 + target_at_least dm-thin-pool "$@" || return 1 # disable thin_check if not present in system which thin_check || lvmconf 'global/thin_check_executable = ""' } +have_raid() { + test "$RAID" = shared -o "$RAID" = internal || return 1 + target_at_least dm-raid "$@" +} + +have_cache() { + test "$CACHE" = shared -o "$CACHE" = internal || return 1 + target_at_least dm-cache "$@" +} + # check if lvm shell is build-in (needs readline) have_readline() { echo version | lvm &>/dev/null diff --git a/test/shell/lvchange-partial-raid10.sh b/test/shell/lvchange-partial-raid10.sh index 3141add..3c112bb 100644 --- a/test/shell/lvchange-partial-raid10.sh +++ b/test/shell/lvchange-partial-raid10.sh @@ -11,7 +11,7 @@ . lib/test -aux target_at_least dm-raid 1 3 2 || skip +aux have_raid 1 3 2 || skip aux prepare_vg 4 diff --git a/test/shell/lvchange-partial.sh b/test/shell/lvchange-partial.sh index 7483d88..c3d7217 100644 --- a/test/shell/lvchange-partial.sh +++ b/test/shell/lvchange-partial.sh @@ -15,7 +15,7 @@ aux prepare_vg 4 TYPE=raid1 -aux target_at_least dm-raid 1 1 0 || TYPE=mirror +aux have_raid 1 1 0 || TYPE=mirror lvcreate -aey --type $TYPE -m 1 -l 2 -n $lv1 $vg lvchange -an $vg/$lv1 diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh index 8ef6c33..209e094 100644 --- a/test/shell/lvchange-raid.sh +++ b/test/shell/lvchange-raid.sh @@ -17,9 +17,9 @@ # Proper mismatch count 1.5.2 upstream,1.3.5 < x < 1.4.0 in RHEL6 # # We will simplify and simple test for 1.5.2 and 1.3.5 < x < 1.4.0 -aux target_at_least dm-raid 1 3 5 && - ! aux target_at_least dm-raid 1 4 0 || - aux target_at_least dm-raid 1 5 2 || skip +aux have_raid 1 3 5 && + ! aux have_raid 1 4 0 || + aux have_raid 1 5 2 || skip # DEVICE "$dev6" is reserved for non-RAID LVs that # will not undergo failure diff --git a/test/shell/lvchange-raid10.sh b/test/shell/lvchange-raid10.sh index b31c328..0d17928 100644 --- a/test/shell/lvchange-raid10.sh +++ b/test/shell/lvchange-raid10.sh @@ -13,7 +13,7 @@ TEST_RAID=raid10 . shell/lvchange-raid.sh -aux target_at_least dm-raid 1 5 2 || skip +aux have_raid 1 5 2 || skip run_types raid10 -m 1 -i 2 "$dev1" "$dev2" "$dev3" "$dev4" diff --git a/test/shell/lvchange-raid456.sh b/test/shell/lvchange-raid456.sh index 83f82c3..b1dd1db 100644 --- a/test/shell/lvchange-raid456.sh +++ b/test/shell/lvchange-raid456.sh @@ -14,7 +14,7 @@ TEST_RAID=raid456 . shell/lvchange-raid.sh aux raid456_replace_works || skip -aux target_at_least dm-raid 1 5 2 || skip +aux have_raid 1 5 2 || skip run_types raid4 -i 2 "$dev1" "$dev2" "$dev3" "$dev4" run_types raid5 -i 2 "$dev1" "$dev2" "$dev3" "$dev4" diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh index 01118cb..2a498b2 100644 --- a/test/shell/lvconvert-raid.sh +++ b/test/shell/lvconvert-raid.sh @@ -22,7 +22,7 @@ get_image_pvs() { ######################################################## # MAIN ######################################################## -aux target_at_least dm-raid 1 2 0 || skip +aux have_raid 1 2 0 || skip aux prepare_pvs 5 vgcreate -s 256k $vg $(cat DEVICES) diff --git a/test/shell/lvconvert-raid10.sh b/test/shell/lvconvert-raid10.sh index 6297f65..e9b0ef8 100644 --- a/test/shell/lvconvert-raid10.sh +++ b/test/shell/lvconvert-raid10.sh @@ -24,7 +24,7 @@ get_image_pvs() { ######################################################## # RAID10: Can replace 'copies - 1' devices from each stripe # Tests are run on 2-way mirror, 3-way stripe RAID10 -aux target_at_least dm-raid 1 3 1 || skip +aux have_raid 1 3 1 || skip # 9 PVs needed for RAID10 testing (3-stripes/2-mirror - replacing 3 devs) aux prepare_pvs 9 80 diff --git a/test/shell/lvconvert-raid456.sh b/test/shell/lvconvert-raid456.sh index bf9a823..b9386c9 100644 --- a/test/shell/lvconvert-raid456.sh +++ b/test/shell/lvconvert-raid456.sh @@ -23,7 +23,7 @@ get_image_pvs() { # MAIN ######################################################## aux raid456_replace_works || skip -aux target_at_least dm-raid 1 2 0 || skip +aux have_raid 1 2 0 || skip aux prepare_pvs 6 vgcreate -s 256k $vg $(cat DEVICES) diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh index bc5483b..7d4ea7e 100644 --- a/test/shell/lvconvert-repair-raid.sh +++ b/test/shell/lvconvert-repair-raid.sh @@ -12,7 +12,7 @@ . lib/test aux raid456_replace_works || skip -aux target_at_least dm-raid 1 1 0 || skip +aux have_raid 1 1 0 || skip aux lvmconf 'allocation/maximise_cling = 0' aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1' diff --git a/test/shell/lvconvert-thin-external.sh b/test/shell/lvconvert-thin-external.sh index 00712bd..5d52e60 100644 --- a/test/shell/lvconvert-thin-external.sh +++ b/test/shell/lvconvert-thin-external.sh @@ -157,7 +157,7 @@ lvremove -ff $vg # Test conversion to the pool and thin external at the same time (rhbz #1003461) lvcreate -l50 -n pool $vg lvcreate -l100 -n thin $vg -lvconvert --thin --thinpool $vg/pool $vg/thin --originname thin-origin +lvconvert --yes --thin --thinpool $vg/pool $vg/thin --originname thin-origin check lv_field $vg/thin segtype thin check lv_field $vg/thin-origin segtype linear diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh index 302a708..1c438e7 100644 --- a/test/shell/lvcreate-cache.sh +++ b/test/shell/lvcreate-cache.sh @@ -11,7 +11,7 @@ . lib/test -aux target_at_least dm-cache 1 3 0 || skip +aux have_cache 1 3 0 || skip aux prepare_vg 5 80 diff --git a/test/shell/lvcreate-large-raid.sh b/test/shell/lvcreate-large-raid.sh index 3f06d04..84110ab 100644 --- a/test/shell/lvcreate-large-raid.sh +++ b/test/shell/lvcreate-large-raid.sh @@ -16,7 +16,7 @@ # FIXME update test to make something useful on <16T aux can_use_16T || skip -aux target_at_least dm-raid 1 1 0 || skip +aux have_raid 1 1 0 || skip aux prepare_vg 5 diff --git a/test/shell/lvcreate-large-raid10.sh b/test/shell/lvcreate-large-raid10.sh index 635d7a3..5a15ee0 100644 --- a/test/shell/lvcreate-large-raid10.sh +++ b/test/shell/lvcreate-large-raid10.sh @@ -16,7 +16,7 @@ # FIXME update test to make something useful on <16T aux can_use_16T || skip -aux target_at_least dm-raid 1 3 0 || skip +aux have_raid 1 3 0 || skip aux prepare_vg 5 diff --git a/test/shell/lvcreate-raid.sh b/test/shell/lvcreate-raid.sh index d0d365f..d9c949a 100644 --- a/test/shell/lvcreate-raid.sh +++ b/test/shell/lvcreate-raid.sh @@ -18,7 +18,7 @@ lv_devices() { ######################################################## # MAIN ######################################################## -aux target_at_least dm-raid 1 1 0 || skip +aux have_raid 1 1 0 || skip aux prepare_pvs 6 20 # 6 devices for RAID10 (2-mirror,3-stripe) test vgcreate -s 512k $vg $(cat DEVICES) diff --git a/test/shell/lvcreate-raid10.sh b/test/shell/lvcreate-raid10.sh index a521794..ae02ab2 100644 --- a/test/shell/lvcreate-raid10.sh +++ b/test/shell/lvcreate-raid10.sh @@ -18,7 +18,7 @@ lv_devices() { ######################################################## # MAIN ######################################################## -aux target_at_least dm-raid 1 3 0 || skip +aux have_raid 1 3 0 || skip aux prepare_pvs 6 20 # 6 devices for RAID10 (2-mirror,3-stripe) test vgcreate -s 512k $vg $(cat DEVICES) diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh index bc8b36f..e13a08d 100644 --- a/test/shell/lvresize-raid.sh +++ b/test/shell/lvresize-raid.sh @@ -11,7 +11,7 @@ . lib/test -aux target_at_least dm-raid 1 1 0 || skip +aux have_raid 1 1 0 || skip aux prepare_pvs 6 80 diff --git a/test/shell/lvresize-raid10.sh b/test/shell/lvresize-raid10.sh index 306507f..42cfeb4 100644 --- a/test/shell/lvresize-raid10.sh +++ b/test/shell/lvresize-raid10.sh @@ -11,7 +11,7 @@ . lib/test -aux target_at_least dm-raid 1 3 0 || skip +aux have_raid 1 3 0 || skip aux prepare_vg 5 diff --git a/test/shell/pvmove-cache-segtypes.sh b/test/shell/pvmove-cache-segtypes.sh index 2b62b1f..db3bde5 100644 --- a/test/shell/pvmove-cache-segtypes.sh +++ b/test/shell/pvmove-cache-segtypes.sh @@ -22,10 +22,10 @@ test_description="ensure pvmove works with the cache segment types" test -e LOCAL_CLVMD && skip which md5sum || skip -aux target_at_least dm-cache 1 3 0 || skip +aux have_cache 1 3 0 || skip # for stacking -aux target_at_least dm-thin-pool 1 8 0 || skip -aux target_at_least dm-raid 1 4 2 || skip +aux have_thin 1 8 0 || skip +aux have_raid 1 4 2 || skip aux prepare_vg 5 80 diff --git a/test/shell/pvmove-raid-segtypes.sh b/test/shell/pvmove-raid-segtypes.sh index 1b0f129..f3f5cd5 100644 --- a/test/shell/pvmove-raid-segtypes.sh +++ b/test/shell/pvmove-raid-segtypes.sh @@ -16,7 +16,7 @@ test_description="ensure pvmove works with raid segment types" test -e LOCAL_CLVMD && skip which md5sum || skip -aux target_at_least dm-raid 1 3 5 || skip +aux have_raid 1 3 5 || skip aux prepare_pvs 5 20 vgcreate -c n -s 128k $vg $(cat DEVICES) diff --git a/test/shell/pvmove-thin-segtypes.sh b/test/shell/pvmove-thin-segtypes.sh index c514bb5..4bd3b29 100644 --- a/test/shell/pvmove-thin-segtypes.sh +++ b/test/shell/pvmove-thin-segtypes.sh @@ -15,9 +15,9 @@ test_description="ensure pvmove works with thin segment types" test -e LOCAL_CLVMD && skip which md5sum || skip -aux target_at_least dm-thin-pool 1 8 0 || skip +aux have_thin 1 8 0 || skip # for stacking -aux target_at_least dm-raid 1 3 5 || skip +aux have_raid 1 3 5 || skip aux prepare_pvs 5 20 vgcreate -c n -s 128k $vg $(cat DEVICES) diff --git a/test/shell/pvremove-thin.sh b/test/shell/pvremove-thin.sh index 03e6ca3..e8af2af 100644 --- a/test/shell/pvremove-thin.sh +++ b/test/shell/pvremove-thin.sh @@ -16,7 +16,7 @@ aux prepare_vg -aux target_at_least dm-thin-pool 1 8 0 || skip +aux have_thin 1 8 0 || skip aux extend_filter_LVMTEST diff --git a/test/shell/vgsplit-raid.sh b/test/shell/vgsplit-raid.sh index 898fc9a..6454556 100644 --- a/test/shell/vgsplit-raid.sh +++ b/test/shell/vgsplit-raid.sh @@ -21,7 +21,7 @@ create_vg_() { vgcreate -s 64k "$@" } -aux target_at_least dm-raid 1 1 0 || skip +aux have_raid 1 1 0 || skip aux prepare_pvs 5 10

1 0

master - tests: wait before down-convert
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7f92c3a13eeba179… Commit: 7f92c3a13eeba179872dacd4b632d8bb5188a0ba Parent: 205be247689d7be38b4341401516a1881e09c6aa Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 19 14:30:15 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:29 2014 +0200 tests: wait before down-convert --- test/shell/lvconvert-mirror.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/test/shell/lvconvert-mirror.sh b/test/shell/lvconvert-mirror.sh index 1e9925a..8c0c72e 100644 --- a/test/shell/lvconvert-mirror.sh +++ b/test/shell/lvconvert-mirror.sh @@ -191,6 +191,10 @@ lvremove -ff $vg # "remove from original mirror (the original becomes linear)" lvcreate -aey -l2 --type mirror -m1 -n $lv1 $vg "$dev1" "$dev2" "$dev3:$DEVRANGE" lvconvert -m+1 -b $vg/$lv1 "$dev4" +# FIXME: Extra wait here for mirror upconvert synchronization +# otherwise we may fail her on parallel upconvert and downconvert +# lvconvert-mirror-updown.sh tests this errornous case separately +lvconvert $vg/$lv1 lvconvert -m-1 $vg/$lv1 "$dev2" lvconvert $vg/$lv1

1 0

master - tests: update lvconvert test
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=205be247689d7be3… Commit: 205be247689d7be38b4341401516a1881e09c6aa Parent: 16424fed543ee6d4841c1e44ba252ae976c28cbb Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 21:11:11 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:29 2014 +0200 tests: update lvconvert test Split raid test to separate file Add --yes flag to automated testing --- test/shell/lvconvert-thin-raid.sh | 31 +++++++++++++++++++++++ test/shell/lvconvert-thin.sh | 47 ++++++++++++++++-------------------- test/shell/pvmove-thin-segtypes.sh | 2 +- 3 files changed, 53 insertions(+), 27 deletions(-) diff --git a/test/shell/lvconvert-thin-raid.sh b/test/shell/lvconvert-thin-raid.sh new file mode 100644 index 0000000..ae3d2ef --- /dev/null +++ b/test/shell/lvconvert-thin-raid.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# 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 +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +. lib/test + +aux have_thin 1 0 0 || skip +aux have_raid 1 4 0 || skip + +aux prepare_vg 4 + +# create RAID LVs for data and metadata volumes +lvcreate -aey --nosync -L10M --type raid1 -m1 -n $lv1 $vg +lvcreate -aey --nosync -L8M --type raid1 -m1 -n $lv2 $vg +lvchange -an $vg/$lv1 + +# conversion fails for internal volumes +fail lvconvert --thinpool $vg/${lv1}_rimage_0 +fail lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/${lv2}_rimage_0 + +lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 + +vgremove -ff $vg diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh index d177f9a..8c3b903 100644 --- a/test/shell/lvconvert-thin.sh +++ b/test/shell/lvconvert-thin.sh @@ -44,29 +44,23 @@ lvcreate -aey -L10M -n $lv2 $vg lvchange -an $vg/$lv1 # conversion fails for mirror segment type -not lvconvert --thinpool $vg/$lv1 -not lvconvert --thinpool $vg/$lv2 --poolmetadata $vg/$lv2 -lvremove -f $vg +fail lvconvert --thinpool $vg/$lv1 +# cannot use same LV +fail lvconvert --yes --thinpool $vg/$lv2 --poolmetadata $vg/$lv2 -# create RAID LVs for data and metadata volumes -lvcreate -aey -L10M --type raid1 -m1 -n $lv1 $vg -lvcreate -aey -L10M --type raid1 -m1 -n $lv2 $vg -lvchange -an $vg/$lv1 +prepare_lvs # conversion fails for internal volumes -not lvconvert --thinpool $vg/${lv1}_rimage_0 -not lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/${lv2}_rimage_0 # can't use --readahead with --poolmetadata -not lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 --readahead 512 - -lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 +invalid lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 --readahead 512 +lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 prepare_lvs -lvconvert -c 64 --stripes 2 --thinpool $vg/$lv1 --readahead 48 +lvconvert --yes -c 64 --stripes 2 --thinpool $vg/$lv1 --readahead 48 lvremove -f $vg lvcreate -L1T -n $lv1 $vg -lvconvert -c 8M --thinpool $vg/$lv1 +lvconvert --yes -c 8M --thinpool $vg/$lv1 lvremove -f $vg # test with bigger sizes @@ -75,29 +69,30 @@ lvcreate -L8M -n $lv2 $vg lvcreate -L1M -n $lv3 $vg # chunk size is bigger then size of thin pool data -not lvconvert -c 1G --thinpool $vg/$lv3 +fail lvconvert --yes -c 1G --thinpool $vg/$lv3 # stripes can't be used with poolmetadata -not lvconvert --stripes 2 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 +invalid lvconvert --stripes 2 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 # too small metadata (<2M) -not lvconvert -c 64 --thinpool $vg/$lv1 --poolmetadata $vg/$lv3 +fail lvconvert --yes -c 64 --thinpool $vg/$lv1 --poolmetadata $vg/$lv3 # too small chunk size fails -not lvconvert -c 4 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 +# 'fail' because profiles need to read VG +fail lvconvert -c 4 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 # too big chunk size fails -not lvconvert -c 2G --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 +fail lvconvert -c 2G --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 # negative chunk size fails -not lvconvert -c -256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 +fail lvconvert -c -256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 # non power of 2 fails -not lvconvert -c 88 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 +fail lvconvert -c 88 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 # Warning about smaller then suggested -lvconvert -c 256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err +lvconvert --yes -c 256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err grep "WARNING: Chunk size is smaller" err lvremove -f $vg lvcreate -L1T -n $lv1 $vg lvcreate -L32G -n $lv2 $vg # Warning about bigger then needed -lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err +lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err grep "WARNING: Maximum size" err lvremove -f $vg @@ -105,14 +100,14 @@ lvremove -f $vg if test "$TSIZE" -eq 64T; then lvcreate -L24T -n $lv1 $vg # Warning about bigger then needed (24T data and 16G -> 128K chunk) -lvconvert -c 64 --thinpool $vg/$lv1 |& tee err +lvconvert --yes -c 64 --thinpool $vg/$lv1 |& tee err grep "WARNING: Chunk size is too small" err fi #lvs -a -o+chunk_size,stripe_size,seg_pe_ranges # Convertions of pool to mirror or RAID is unsupported -not lvconvert --type mirror -m1 $vg/$lv1 -not lvconvert --type raid1 -m1 $vg/$lv1 +fail lvconvert --type mirror -m1 $vg/$lv1 +fail lvconvert --type raid1 -m1 $vg/$lv1 vgremove -ff $vg diff --git a/test/shell/pvmove-thin-segtypes.sh b/test/shell/pvmove-thin-segtypes.sh index 684b3f5..c514bb5 100644 --- a/test/shell/pvmove-thin-segtypes.sh +++ b/test/shell/pvmove-thin-segtypes.sh @@ -49,7 +49,7 @@ lvremove -ff $vg lvcreate -l 2 -n ${lv1}_foo $vg "$dev1" lvcreate --type raid1 -m 1 -l 4 -n ${lv1}_raid1_pool $vg "$dev1" "$dev2" lvcreate --type raid1 -m 1 -L 2 -n ${lv1}_raid1_meta $vg "$dev1" "$dev2" -lvconvert --thinpool $vg/${lv1}_raid1_pool \ +lvconvert --yes --thinpool $vg/${lv1}_raid1_pool \ --poolmetadata ${lv1}_raid1_meta lvcreate -T $vg/${lv1}_raid1_pool -V 8 -n $lv1 check lv_tree_on $vg ${lv1}_foo "$dev1"

1 0

master - thin: improve lvconvert messages
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=16424fed543ee6d4… Commit: 16424fed543ee6d4841c1e44ba252ae976c28cbb Parent: d1d50d4023d7825fe9d9d3811375e44b90def529 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 20:05:09 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:29 2014 +0200 thin: improve lvconvert messages Add more info into printed message. --- tools/lvconvert.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 3f1fd46..79f2be5 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -2570,7 +2570,9 @@ static int _lvconvert_thinpool_external(struct cmd_context *cmd, goto deactivate_and_revert_new_lv; } - log_print_unless_silent("Converted %s/%s to thin external origin.", + log_print_unless_silent("Converted \"%s/%s\" to thin volume with " + "external origin \"%s/%s\".", + vg->name, torigin_lv->name, vg->name, external_lv->name); return 1; @@ -2954,7 +2956,7 @@ mda_write: goto out; } - log_print_unless_silent("Converted %s/%s to %s pool.", + log_print_unless_silent("Converted \"%s/%s\" to %s pool.", pool_lv->vg->name, pool_lv->name, (segtype_is_cache_pool(lp->segtype)) ? "cache" : "thin");

1 0

master - cleanup: use print when displaying info
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d1d50d4023d7825f… Commit: d1d50d4023d7825fe9d9d3811375e44b90def529 Parent: 54184f92acea10de5b75ad013f6c8aaf7db03176 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 12:56:49 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:29 2014 +0200 cleanup: use print when displaying info Use error or warn only when we really have some problem in the code. --- tools/lvconvert.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 50771b4..3f1fd46 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1629,7 +1629,7 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd, lv_check_transient(lv); /* TODO check this in lib for all commands? */ if (!(lv->status & PARTIAL_LV)) { - log_warn("%s is consistent. Nothing to repair.", lv->name); + log_print_unless_silent("%s is consistent. Nothing to repair.", lv->name); return 1; } @@ -1640,15 +1640,15 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd, return_0; if (failed_mimages) - log_error("Mirror status: %d of %d images failed.", - failed_mimages, original_mimages); + log_print_unless_silent("Mirror status: %d of %d images failed.", + failed_mimages, original_mimages); /* * Count the failed log devices */ if (failed_logs) - log_error("Mirror log status: %d of %d images failed.", - failed_logs, original_logs); + log_print_unless_silent("Mirror log status: %d of %d images failed.", + failed_logs, original_logs); /* * Find out our policies

1 0

master - cleanup: indent
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=54184f92acea10de… Commit: 54184f92acea10de5b75ad013f6c8aaf7db03176 Parent: 2941cffd2c6bf67ea2b47696e0ad111f07cf921d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 20:10:55 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:28 2014 +0200 cleanup: indent --- tools/lvconvert.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 03cd42d..50771b4 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1077,15 +1077,13 @@ static void _lvconvert_mirrors_repair_ask(struct cmd_context *cmd, return; if (failed_log && - yes_no_prompt("Attempt to replace failed mirror log? [y/n]: ") == 'n') { + yes_no_prompt("Attempt to replace failed mirror log? [y/n]: ") == 'n') *replace_log = 0; - } if (failed_mirrors && yes_no_prompt("Attempt to replace failed mirror images " - "(requires full device resync)? [y/n]: ") == 'n') { + "(requires full device resync)? [y/n]: ") == 'n') *replace_mirrors = 0; - } } /* @@ -1677,14 +1675,12 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd, if (_lvconvert_mirrors_aux(cmd, lv, lp, NULL, lp->mirrors, log_count)) break; - else { - if (lp->mirrors > 2) - -- lp->mirrors; - else if (log_count > 0) - -- log_count; - else - break; /* nowhere to go, anymore... */ - } + if (lp->mirrors > 2) + --lp->mirrors; + else if (log_count > 0) + --log_count; + else + break; /* nowhere to go, anymore... */ } if (replace_mimages && lv_mirror_count(lv) != original_mimages)

1 0

master - cleanup: unneeded initialization
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2941cffd2c6bf67e… Commit: 2941cffd2c6bf67ea2b47696e0ad111f07cf921d Parent: 65b3fe9b058862c09994b98c246faaf7e0c0e0aa Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 20:10:29 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:28 2014 +0200 cleanup: unneeded initialization Move or drop initialization where it is not needed. --- tools/lvconvert.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 2200ba2..03cd42d 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1054,13 +1054,10 @@ static void _lvconvert_mirrors_repair_ask(struct cmd_context *cmd, int failed_log, int failed_mirrors, int *replace_log, int *replace_mirrors) { - const char *leg_policy = NULL, *log_policy = NULL; - + const char *leg_policy, *log_policy; int force = arg_count(cmd, force_ARG); int yes = arg_count(cmd, yes_ARG); - *replace_log = *replace_mirrors = 1; - if (arg_count(cmd, use_policies_ARG)) { leg_policy = find_config_tree_str(cmd, activation_mirror_image_fault_policy_CFG, NULL); log_policy = find_config_tree_str(cmd, activation_mirror_log_fault_policy_CFG, NULL); @@ -1074,6 +1071,8 @@ static void _lvconvert_mirrors_repair_ask(struct cmd_context *cmd, return; } + *replace_log = *replace_mirrors = 1; + if (yes) return; @@ -1616,8 +1615,8 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd, struct logical_volume *lv, struct lvconvert_params *lp) { - int failed_logs = 0; - int failed_mimages = 0; + int failed_logs; + int failed_mimages; int replace_logs = 0; int replace_mimages = 0; uint32_t log_count;

1 0

master - man: cleanup style
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=65b3fe9b058862c0… Commit: 65b3fe9b058862c09994b98c246faaf7e0c0e0aa Parent: 9fd0be2a8507e1134bf1f5d0e84dd80b765a6b19 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 12:54:19 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:28 2014 +0200 man: cleanup style --- man/lvconvert.8.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/lvconvert.8.in b/man/lvconvert.8.in index 8c3479f..91c5bee 100644 --- a/man/lvconvert.8.in +++ b/man/lvconvert.8.in @@ -227,7 +227,7 @@ in the background. You should only use this if udev is not running or has rules that ignore the devices LVM2 creates. .TP .B \-\-splitmirrors \fIImages -The number of redundant Images of a mirror to be split off and used +The number of redundant \fIImages\fP of a mirror to be split off and used to form a new logical volume. A name must be supplied for the newly-split-off logical volume using the \fB\-\-name\fP argument, unless the \fB\-\-trackchanges\fP argument is given. @@ -246,11 +246,11 @@ Please note that this feature is only supported with the new md-based mirror implementation and not with the original device-mapper mirror implementation. .TP .B \-\-splitsnapshot -Separates SnapshotLogicalVolume from its origin. +Separates \fISnapshotLogicalVolume\fP from its origin. The volume that is split off contains the chunks that differ from the origin along with the metadata describing them. This volume can be wiped and then destroyed with lvremove. -The inverse of \-\-snapshot. +The inverse of \fB\-\-snapshot\fP. .TP .B \-s, \-\-snapshot Recreates a snapshot from constituent logical volumes (or copies of them) after

1 0

master - debug: fix backtracing
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9fd0be2a8507e113… Commit: 9fd0be2a8507e1134bf1f5d0e84dd80b765a6b19 Parent: c70c100cce6cdd1f3723203c2cec4427eba7a464 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 12:53:51 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:50:28 2014 +0200 debug: fix backtracing --- lib/metadata/mirror.c | 2 +- tools/lvconvert.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 86ec4ca..9a413e8 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -2156,7 +2156,7 @@ int lv_split_mirror_images(struct logical_volume *lv, const char *split_name, */ r = _split_mirror_images(lv, split_name, split_count, removable_pvs); if (!r) - return 0; + return_0; return 1; } diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 3c20257..2200ba2 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1001,7 +1001,7 @@ static struct dm_list *_failed_pv_list(struct volume_group *vg) if (!(failed_pvs = dm_pool_alloc(vg->vgmem, sizeof(*failed_pvs)))) { log_error("Allocation of list of failed_pvs failed."); - return_NULL; + return NULL; } dm_list_init(failed_pvs); @@ -1022,7 +1022,7 @@ static struct dm_list *_failed_pv_list(struct volume_group *vg) if (!(new_pvl = dm_pool_alloc(vg->vgmem, sizeof(*new_pvl)))) { log_error("Allocation of failed_pvs list entry failed."); - return_NULL; + return NULL; } new_pvl->pv = pvl->pv; dm_list_add(failed_pvs, &new_pvl->list); @@ -1539,7 +1539,7 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd, } if (!lv_split_mirror_images(lv, lp->lv_split_name, nmc, operable_pvs)) - return 0; + return_0; } else if (!lv_remove_mirrors(cmd, lv, nmc, nlc, is_mirror_image_removable, operable_pvs, 0)) return_0; @@ -1584,17 +1584,17 @@ int mirror_remove_missing(struct cmd_context *cmd, * will get stuck during a suspend. */ if (!_lv_update_mirrored_log(lv, failed_pvs, log_count)) - return 0; + return_0; if (_failed_mirrors_count(lv) > 0 && !lv_remove_mirrors(cmd, lv, _failed_mirrors_count(lv), log_count ? 0U : 1U, _is_partial_lv, NULL, 0)) - return 0; + return_0; if (lv_is_mirrored(lv) && !_lv_update_log_type(cmd, NULL, lv, failed_pvs, log_count)) - return 0; + return_0; if (!_reload_lv(cmd, lv->vg, lv)) return_0;

1 0

master - lvconvert: check ret code of mirror_remove_missing
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c70c100cce6cdd1f… Commit: c70c100cce6cdd1f3723203c2cec4427eba7a464 Parent: bbf4b2c1c9da174c607daee9f920f32517d48e6a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 12:57:42 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:49:42 2014 +0200 lvconvert: check ret code of mirror_remove_missing When mirror_remove_missing() fails, stop repairing mirror. --- WHATS_NEW | 1 + tools/lvconvert.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 5e13c04..86ed3bc 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Check for failing mirror_remove_missing() function. Prompt before converting volumes to thin pool and thin pool metadata. Add dumpconfig --type profilable-{metadata,command} to select profile type. Exit immediately with error if command profile is found invalid. diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 79a78a4..3c20257 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1639,7 +1639,8 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd, failed_mimages = _failed_mirrors_count(lv); failed_logs = _failed_logs_count(lv); - mirror_remove_missing(cmd, lv, 0); + if (!mirror_remove_missing(cmd, lv, 0)) + return_0; if (failed_mimages) log_error("Mirror status: %d of %d images failed.",

1 0

master - thin: lvconvert warn before conversion
by Zdenek Kabelac 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bbf4b2c1c9da174c… Commit: bbf4b2c1c9da174c607daee9f920f32517d48e6a Parent: 83f468be4e8ff6189523eae7de8a087ab42021be Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 20 16:21:14 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 20 21:48:47 2014 +0200 thin: lvconvert warn before conversion Warn user before converting volume to different type. WARNING: Converting vg/lvol0 logical volume to pool's meta/data volume. THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.) Since the content of volume is lost we have to query user to confirm such operation. If user is 100% sure, he may use '--yes' to avoid prompts. --- WHATS_NEW | 1 + tools/lvconvert.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 51249ed..5e13c04 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Prompt before converting volumes to thin pool and thin pool metadata. Add dumpconfig --type profilable-{metadata,command} to select profile type. Exit immediately with error if command profile is found invalid. Separate --profile cmd line arg into --commandprofile and --metadataprofile. diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 94d870a..79a78a4 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -2718,6 +2718,17 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, return 0; } + log_warn("WARNING: Converting \"%s/%s\" logical volume to pool's data volume.", + pool_lv->vg->name, pool_lv->name); + log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)"); + + if (!lp->yes && + yes_no_prompt("Do you really want to convert \"%s/%s\"? [y|n]: ", + pool_lv->vg->name, pool_lv->name) == 'n') { + log_error("Conversion aborted."); + return 0; + } + if ((dm_snprintf(metadata_name, sizeof(metadata_name), "%s%s", pool_lv->name, (segtype_is_cache_pool(lp->segtype)) ? @@ -2825,6 +2836,17 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, return 0; } + log_warn("WARNING: Converting \"%s/%s\" logical volume to pool's metadata volume.", + metadata_lv->vg->name, metadata_lv->name); + log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)"); + + if (!lp->yes && + yes_no_prompt("Do you really want to convert \"%s/%s\"? [y|n]: ", + metadata_lv->vg->name, metadata_lv->name) == 'n') { + log_error("Conversion aborted."); + return 0; + } + lp->poolmetadata_size = metadata_lv->size; max_metadata_size = (segtype_is_cache_pool(lp->segtype)) ? DEFAULT_CACHE_POOL_MAX_METADATA_SIZE * 2 :

1 0

master - tests: update profiles.sh test for latest changes
by Peter Rajnoha 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=83f468be4e8ff618… Commit: 83f468be4e8ff6189523eae7de8a087ab42021be Parent: 9c937e7d54221a783d294768efbaad12473a0265 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue May 20 14:50:42 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue May 20 16:27:09 2014 +0200 tests: update profiles.sh test for latest changes --- test/shell/profiles.sh | 130 +++++++++++++++++++++++++++--------------------- 1 files changed, 73 insertions(+), 57 deletions(-) diff --git a/test/shell/profiles.sh b/test/shell/profiles.sh index bae13d6..49b8b9c 100644 --- a/test/shell/profiles.sh +++ b/test/shell/profiles.sh @@ -15,12 +15,16 @@ . lib/test -MSG_FAILED_TO_APPLY_PROFILE="Failed to apply configuration profile" -MSG_IGNORING_INVALID_PROFILE="Ignoring invalid configuration profile" +MSG_FAILED_TO_APPLY_CMD_PROFILE="Failed to apply command profile" +MSG_IGNORING_INVALID_CMD_PROFILE="Ignoring invalid command profile" +MSG_FAILED_TO_APPLY_MDA_PROFILE="Failed to apply metadata profile" +MSG_IGNORING_INVALID_MDA_PROFILE="Ignoring invalid metadata profile" MSG_NOT_PROFILABLE="not customizable by a profile" +MSG_CMD_PROFILABLE_ONLY="customizable by command profile only, not metadata profile" +MSG_MDA_PROFILABLE_ONLY="customizable by metadata profile only, not command profile" # fail if the profile requested by --profile cmdline option is not present -not pvs --profile nonexistent 2>&1 | grep "$MSG_FAILED_TO_APPLY_PROFILE" +not pvs --profile nonexistent 2>&1 | grep "$MSG_FAILED_TO_APPLY_CMD_PROFILE" # config/checks=1: warning message about setting not being profilable + # summary error message about invalid profile @@ -28,58 +32,68 @@ not pvs --profile nonexistent 2>&1 | grep "$MSG_FAILED_TO_APPLY_PROFILE" aux profileconf invalid 'log/prefix=" "' aux lvmconf 'config/checks = 0' -pvs --profile invalid 2>msg +not pvs --profile invalid 2>msg not grep "$MSG_NOT_PROFILABLE" msg -grep "$MSG_IGNORING_INVALID_PROFILE" msg +grep "$MSG_IGNORING_INVALID_CMD_PROFILE" msg +grep "$MSG_FAILED_TO_APPLY_CMD_PROFILE" msg aux lvmconf 'config/checks = 1' -pvs --profile invalid 2>msg +not pvs --profile invalid 2>msg grep "$MSG_NOT_PROFILABLE" msg -grep "$MSG_IGNORING_INVALID_PROFILE" msg +grep "$MSG_IGNORING_INVALID_CMD_PROFILE" msg +grep "$MSG_FAILED_TO_APPLY_CMD_PROFILE" msg aux lvmconf 'allocation/thin_pool_zero = 1' # all profilable items listed here - should pass -aux profileconf valid 'allocation/thin_pool_zero = 0' \ - 'allocation/thin_pool_discards = "passdown"' \ - 'allocation/thin_pool_chunk_size = 64'\ - 'activation/thin_pool_autoextend_threshold = 100' \ - 'activation/thin_pool_autoextend_percent = 20' \ - 'global/units = "h"' \ - 'global/si_unit_consistency = 1' \ - 'global/suffix = 1' \ - 'global/lvdisplay_shows_full_device_path = 0' \ - 'report/aligned = 1' \ - 'report/buffered = 1' \ - 'report/headings = 1' \ - 'report/separator = " "' \ - 'report/prefixes = 0' \ - 'report/quoted = 1' \ - 'report/colums_as_rows = 0' \ - 'report/devtypes_sort = "devtype_name"' \ - 'report/devtypes_cols = "devtype_name,devtype_max_partitions,devtype_description"' \ - 'report/devtypes_cols_verbose = "devtype_name,devtype_max_partitions,devtype_description"' \ - 'report/lvs_sort = "vg_name,lv_name"' \ - 'report/lvs_cols = "lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,move_pv,mirror_log,copy_percent,convert_lv"' \ - 'report/lvs_cols_verbose = "lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile"' \ - 'report/vgs_sort = "vg_name"' \ - 'report/vgs_cols = "vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free"' \ - 'report/vgs_cols_verbose = "vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile"' \ - 'report/pvs_sort = "pv_name"' \ - 'report/pvs_cols = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free"' \ - 'report/pvs_cols_verbose = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid"' \ - 'report/segs_sort = "vg_name,lv_name,seg_start"' \ - 'report/segs_cols = "lv_name,vg_name,lv_attr,stripes,segtype,seg_size"' \ - 'report/segs_cols_verbose = "lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize"' \ - 'report/pvsegs_sort = "pv_name,pvseg_start"' \ - 'report/pvsegs_cols = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size"' \ - 'report/pvsegs_cols_verbose = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges"' - -aux profileconf extra 'allocation/thin_pool_chunk_size = 128' - -pvs --profile valid 2>msg +aux profileconf valid_cmd_profile 'global/units = "h"' \ + 'global/si_unit_consistency = 1' \ + 'global/suffix = 1' \ + 'global/lvdisplay_shows_full_device_path = 0' \ + 'report/aligned = 1' \ + 'report/buffered = 1' \ + 'report/headings = 1' \ + 'report/separator = " "' \ + 'report/prefixes = 0' \ + 'report/quoted = 1' \ + 'report/colums_as_rows = 0' \ + 'report/devtypes_sort = "devtype_name"' \ + 'report/devtypes_cols = "devtype_name,devtype_max_partitions,devtype_description"' \ + 'report/devtypes_cols_verbose = "devtype_name,devtype_max_partitions,devtype_description"' \ + 'report/lvs_sort = "vg_name,lv_name"' \ + 'report/lvs_cols = "lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,move_pv,mirror_log,copy_percent,convert_lv"' \ + 'report/lvs_cols_verbose = "lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile"' \ + 'report/vgs_sort = "vg_name"' \ + 'report/vgs_cols = "vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free"' \ + 'report/vgs_cols_verbose = "vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile"' \ + 'report/pvs_sort = "pv_name"' \ + 'report/pvs_cols = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free"' \ + 'report/pvs_cols_verbose = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid"' \ + 'report/segs_sort = "vg_name,lv_name,seg_start"' \ + 'report/segs_cols = "lv_name,vg_name,lv_attr,stripes,segtype,seg_size"' \ + 'report/segs_cols_verbose = "lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize"' \ + 'report/pvsegs_sort = "pv_name,pvseg_start"' \ + 'report/pvsegs_cols = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size"' \ + 'report/pvsegs_cols_verbose = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges"' + +aux profileconf valid_mda_profile 'allocation/thin_pool_zero = 0' \ + 'allocation/thin_pool_discards = "passdown"' \ + 'allocation/thin_pool_chunk_size = 64'\ + 'activation/thin_pool_autoextend_threshold = 100' \ + 'activation/thin_pool_autoextend_percent = 20' \ + + +aux profileconf extra_mda_profile 'allocation/thin_pool_chunk_size = 128' + +pvs --profile valid_cmd_profile 2>msg not grep "$MSG_NOT_PROFILABLE" msg -not grep "$MSG_IGNORING_INVALID_PROFILE" msg +not grep "$MSG_IGNORING_INVALID_CMD_PROFILE" msg +not grep "$MSG_IGNORING_INVALID_MDA_PROFILE" msg + +not pvs --profile valid_mda_profile 2>msg +grep "$MSG_MDA_PROFILABLE_ONLY" msg +grep "$MSG_IGNORING_INVALID_CMD_PROFILE" msg +not grep "$MSG_IGNORING_INVALID_MDA_PROFILE" msg # attaching/detaching profiles to VG/LV aux prepare_pvs 1 8 @@ -88,27 +102,29 @@ vgcreate $vg1 "$dev1" check vg_field $vg1 vg_profile "" lvcreate -l 1 -n $lv1 $vg1 check lv_field $vg1/$lv1 lv_profile "" -vgchange --profile valid $vg1 -check vg_field $vg1 vg_profile valid +vgchange --profile valid_mda_profile $vg1 +check vg_field $vg1 vg_profile valid_mda_profile check lv_field $vg1/$lv1 lv_profile "" -lvchange --profile extra $vg1/$lv1 -check vg_field $vg1 vg_profile valid -check lv_field $vg1/$lv1 lv_profile extra +lvchange --profile extra_mda_profile $vg1/$lv1 +check vg_field $vg1 vg_profile valid_mda_profile +check lv_field $vg1/$lv1 lv_profile extra_mda_profile vgchange --detachprofile $vg1 check vg_field $vg1 vg_profile "" -check lv_field $vg1/$lv1 lv_profile extra +check lv_field $vg1/$lv1 lv_profile extra_mda_profile lvchange --detachprofile $vg1/$lv1 check vg_field $vg1 vg_profile "" check lv_field $vg1/$lv1 lv_profile "" # dumpconfig and merged lvm.conf + profile +aux lvmconf 'global/units="m"' +aux profileconf extra_cmd_profile 'global/units="h"' lvm dumpconfig &>out -grep 'thin_pool_zero=1' out -lvm dumpconfig --profile valid --mergedconfig >out -grep 'thin_pool_zero=0' out +grep 'units="m"' out +lvm dumpconfig --profile extra_cmd_profile --mergedconfig >out +grep 'units="h"' out # dumpconfig --profilable output must be usable as a profile -lvm dumpconfig --type profilable --file etc/profile/generated.profile +lvm dumpconfig --type profilable-command --file etc/profile/generated.profile pvs --profile generated &> msg not grep "$MSG_NOT_PROFILABLE" msg -not grep "$MSG_IGNORING_INVALID_PROFILE" msg +not grep "$MSG_IGNORING_INVALID_CMD_PROFILE" msg

1 0

master - dumpconfig: add --type profilable-command/profilable-metadata, --metadataprofile/--commandprofile
by Peter Rajnoha 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9c937e7d54221a78… Commit: 9c937e7d54221a783d294768efbaad12473a0265 Parent: 9e3e4d69944f072742fd13c5ac74d68e41a3db55 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue May 20 14:45:20 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue May 20 16:27:07 2014 +0200 dumpconfig: add --type profilable-command/profilable-metadata, --metadataprofile/--commandprofile The dumpconfig now understands --commandprofile/--profile/--metadataprofile The --commandprofile and --profile functionality is almost the same with only one difference and that is that the --profile is just used for dumping the content, it's not applied for the command itself (while the --commandprofile profile is applied like it is done for any other LVM command). We also allow --metadataprofile for dumpconfig - dumpconfig *does not* touch VG/LV and metadata in any way so it's OK to use it here (just for dumping the content, checking the profile validity etc.). The validity of the profile can be checked with: dumpconfig --commandprofile/--profile/--metadataprofile --validate ...depending on the profile type. Also, mention --config in the dumpconfig help string so users know that dumpconfig handles this too (it did even before, but it was not documented in the help string). --- WHATS_NEW | 1 + lib/config/config.c | 11 +++++++++++ lib/config/config.h | 2 ++ tools/commands.h | 10 +++++++--- tools/dumpconfig.c | 26 +++++++++++++++++++++++++- 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index b57a1c3..51249ed 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Add dumpconfig --type profilable-{metadata,command} to select profile type. Exit immediately with error if command profile is found invalid. Separate --profile cmd line arg into --commandprofile and --metadataprofile. Strictly separate command profiles and per-VG/LV profiles referenced in mda. diff --git a/lib/config/config.c b/lib/config/config.c index 4fbee66..ecb674e 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -1622,6 +1622,7 @@ static struct dm_config_node *_add_def_node(struct dm_config_tree *cft, static int _should_skip_def_node(struct config_def_tree_spec *spec, int section_id, int id) { cfg_def_item_t *def = cfg_def_get_item_p(id); + uint16_t flags; if ((def->parent != section_id) || (spec->ignoreadvanced && def->flags & CFG_ADVANCED) || @@ -1645,9 +1646,19 @@ static int _should_skip_def_node(struct config_def_tree_spec *spec, int section_ return 1; break; case CFG_DEF_TREE_PROFILABLE: + case CFG_DEF_TREE_PROFILABLE_CMD: + case CFG_DEF_TREE_PROFILABLE_MDA: if (!(def->flags & CFG_PROFILABLE) || (def->since_version > spec->version)) return 1; + flags = def->flags & ~CFG_PROFILABLE; + if (spec->type == CFG_DEF_TREE_PROFILABLE_CMD) { + if (flags & CFG_PROFILABLE_METADATA) + return 1; + } else if (spec->type == CFG_DEF_TREE_PROFILABLE_MDA) { + if (!(flags & CFG_PROFILABLE_METADATA)) + return 1; + } break; default: if (def->since_version > spec->version) diff --git a/lib/config/config.h b/lib/config/config.h index 0618045..7b1d5b6 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -129,6 +129,8 @@ typedef enum { CFG_DEF_TREE_DEFAULT, /* tree of all possible config nodes with default values */ CFG_DEF_TREE_NEW, /* tree of all new nodes that appeared in given version */ CFG_DEF_TREE_PROFILABLE, /* tree of all nodes that are customizable by profiles */ + CFG_DEF_TREE_PROFILABLE_CMD, /* tree of all nodes that are customizable by command profiles (subset of PROFILABLE) */ + CFG_DEF_TREE_PROFILABLE_MDA, /* tree of all nodes that are customizable by metadata profiles (subset of PROFILABLE) */ CFG_DEF_TREE_DIFF, /* tree of all nodes that differ from defaults */ } cfg_def_tree_t; diff --git a/tools/commands.h b/tools/commands.h index 6ed4f8d..50db8eb 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -59,18 +59,22 @@ xx(dumpconfig, "dumpconfig\n" "\t[--commandprofile ProfileName]\n" "\t[-f|--file filename] \n" - "\t[--type {current|default|diff|missing|new|profilable} \n" + "\t[--type {current|default|diff|missing|new|profilable|profilable-command|profilable-metadata} \n" "\t[--atversion version]] \n" "\t[--ignoreadvanced] \n" "\t[--ignoreunsupported] \n" + "\t[--config ConfigurationString] \n" + "\t[--commandprofile ProfileName] \n" + "\t[--profile ProfileName] \n" + "\t[--metadataprofile ProfileName] \n" "\t[--mergedconfig] \n" "\t[--validate]\n" "\t[--withcomments] \n" "\t[--withversions] \n" "\t[ConfigurationNode...]\n", atversion_ARG, configtype_ARG, file_ARG, ignoreadvanced_ARG, - ignoreunsupported_ARG, mergedconfig_ARG, validate_ARG, - withcomments_ARG, withversions_ARG) + ignoreunsupported_ARG, mergedconfig_ARG, metadataprofile_ARG, + validate_ARG, withcomments_ARG, withversions_ARG) xx(formats, "List available metadata formats", diff --git a/tools/dumpconfig.c b/tools/dumpconfig.c index 141a030..09f2119 100644 --- a/tools/dumpconfig.c +++ b/tools/dumpconfig.c @@ -92,6 +92,7 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv) struct config_def_tree_spec tree_spec = {0}; struct dm_config_tree *cft = NULL; struct cft_check_handle *cft_check_handle = NULL; + struct profile *profile = NULL; int r = ECMD_PROCESSED; tree_spec.cmd = cmd; @@ -132,6 +133,18 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; /* + * The profile specified by --profile cmd arg is like --commandprofile, + * but it is used just for dumping the profile content and not for + * application. + */ + if (arg_count(cmd, profile_ARG) && + (!(profile = add_profile(cmd, arg_str_value(cmd, profile_ARG, NULL), CONFIG_PROFILE_COMMAND)) || + !override_config_tree_from_profile(cmd, profile))) { + log_error("Failed to load profile %s.", arg_str_value(cmd, profile_ARG, NULL)); + return ECMD_FAILED; + } + + /* * Set the 'cft' to work with based on whether we need the plain * config tree or merged config tree cascade if --mergedconfig is used. */ @@ -188,9 +201,18 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv) tree_spec.type = CFG_DEF_TREE_PROFILABLE; /* profilable type does not require check status */ } + else if (!strcmp(type, "profilable-command")) { + tree_spec.type = CFG_DEF_TREE_PROFILABLE_CMD; + /* profilable-command type does not require check status */ + } + else if (!strcmp(type, "profilable-metadata")) { + tree_spec.type = CFG_DEF_TREE_PROFILABLE_MDA; + /* profilable-metadata type does not require check status */ + } else { log_error("Incorrect type of configuration specified. " - "Expected one of: current, default, missing, new, profilable."); + "Expected one of: current, default, missing, new, " + "profilable, profilable-command, profilable-metadata."); r = EINVALID_CMD_LINE; goto out; } @@ -218,6 +240,8 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv) out: if (cft && (cft != cmd->cft)) dm_pool_destroy(cft->mem); + else if (profile) + remove_config_tree_by_source(cmd, CONFIG_PROFILE_COMMAND); /* * The cmd->cft (the "current" tree) is destroyed

1 0

master - config: differentiate command and metadata profiles and consolidate profile handling code
by Peter Rajnoha 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9e3e4d69944f0727… Commit: 9e3e4d69944f072742fd13c5ac74d68e41a3db55 Parent: c5fbd2c59f1248b1315aae71dee032878d8476f8 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue May 20 14:13:10 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue May 20 16:21:48 2014 +0200 config: differentiate command and metadata profiles and consolidate profile handling code - When defining configuration source, the code now uses separate CONFIG_PROFILE_COMMAND and CONFIG_PROFILE_METADATA markers (before, it was just CONFIG_PROFILE that did not make the difference between the two). This helps when checking the configuration if it contains correct set of options which are all in either command-profilable or metadata-profilable group without mixing these groups together - so it's a firm distinction. The "command profile" can't contain "metadata profile" and vice versa! This is strictly checked and if the settings are mixed, such profile is rejected and it's not used. So in the end, the CONFIG_PROFILE_COMMAND set of options and CONFIG_PROFILE_METADATA are mutually exclusive sets. - Marking configuration with one or the other marker will also determine the way these configuration sources are positioned in the configuration cascade which is now: CONFIG_STRING -> CONFIG_PROFILE_COMMAND -> CONFIG_PROFILE_METADATA -> CONFIG_FILE/CONFIG_MERGED_FILES - Marking configuration with one or the other marker will also make it possible to issue a command context refresh (will be probably a part of a future patch) if needed for settings in global profile set. For settings in metadata profile set this is impossible since we can't refresh cmd context in the middle of reading VG/LV metadata and for each VG/LV separately because each VG/LV can have a different metadata profile assinged and it's not possible to change these settings at this level. - When command profile is incorrect, it's rejected *and also* the command exits immediately - the profile *must* be correct for the command that was run with a profile to be executed. Before this patch, when the profile was found incorrect, there was just the warning message and the command continued without profile applied. But it's more correct to exit immediately in this case. - When metadata profile is incorrect, we reject it during command runtime (as we know the profile name from metadata and not early from command line as it is in case of command profiles) and we *do continue* with the command as we're in the middle of operation. Also, the metadata profile is applied directly and on the fly on find_config_tree_* fn call and even if the metadata profile is found incorrect, we still need to return the non-profiled value as found in the other configuration provided or default value. To exit immediately even in this case, we'd need to refactor existing find_config_tree_* fns so they can return error. Currently, these fns return only config values (which end up with default values in the end if the config is not found). - To check the profile validity before use to be sure it's correct, one can use : lvm dumpconfig --commandprofile/--metadataprofile ProfileName --validate (the --commandprofile/--metadataprofile for dumpconfig will come as part of the subsequent patch) - This patch also adds a reference to --commandprofile and --metadataprofile in the cmd help string (which was missing before for the --profile for some commands). We do not mention --profile now as people should use --commandprofile or --metadataprofile directly. However, the --profile is still supported for backward compatibility and it's translated as: --profile == --metadataprofile for lvcreate, vgcreate, lvchange and vgchange (as these commands are able to attach profile to metadata) --profile == --commandprofile for all the other commands (--metadataprofile is not allowed there as it makes no sense) - This patch also contains some cleanups to make the code handling the profiles more readable... --- WHATS_NEW | 3 + lib/commands/toolcontext.c | 20 ++- lib/config/config.c | 322 ++++++++++++++++++++++++++++++----------- lib/config/config.h | 15 +- lib/format_text/import_vsn1.c | 4 +- lib/metadata/lv_manip.c | 2 +- lib/mm/memlock.c | 2 +- tools/args.h | 2 + tools/commands.h | 101 ++++++++++--- tools/lvchange.c | 22 ++- tools/lvmcmdline.c | 141 ++++++++++++++++--- tools/vgchange.c | 14 ++- tools/vgcreate.c | 2 +- 13 files changed, 495 insertions(+), 155 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 6cbd622..b57a1c3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,8 @@ Version 2.02.107 - ================================== + Exit immediately with error if command profile is found invalid. + Separate --profile cmd line arg into --commandprofile and --metadataprofile. + Strictly separate command profiles and per-VG/LV profiles referenced in mda. Fix dumpconfig --type diff when run as second and later cmd in lvm shell. Fix wrong profile reuse from previous run if another cmd is run in lvm shell. Move cache description from lvm(8) to lvmcache(7) man page. diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 904ae83..519d36a 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -717,7 +717,8 @@ static void _destroy_config(struct cmd_context *cmd) /* CONFIG_PROFILE */ if (cmd->profile_params) { - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, CONFIG_PROFILE_COMMAND); + remove_config_tree_by_source(cmd, CONFIG_PROFILE_METADATA); /* * Destroy config trees for any loaded profiles and * move these profiles to profile_to_load list. @@ -1605,7 +1606,7 @@ int refresh_filters(struct cmd_context *cmd) int refresh_toolcontext(struct cmd_context *cmd) { struct dm_config_tree *cft_cmdline, *cft_tmp; - const char *profile_name; + const char *profile_command_name, *profile_metadata_name; struct profile *profile; log_verbose("Reloading config files"); @@ -1633,8 +1634,10 @@ int refresh_toolcontext(struct cmd_context *cmd) cft_cmdline = remove_config_tree_by_source(cmd, CONFIG_STRING); /* save the global profile name used */ - profile_name = cmd->profile_params->global_profile ? - cmd->profile_params->global_profile->name : NULL; + profile_command_name = cmd->profile_params->global_command_profile ? + cmd->profile_params->global_command_profile->name : NULL; + profile_metadata_name = cmd->profile_params->global_metadata_profile ? + cmd->profile_params->global_metadata_profile->name : NULL; _destroy_config(cmd); @@ -1653,8 +1656,13 @@ int refresh_toolcontext(struct cmd_context *cmd) cmd->cft = dm_config_insert_cascaded_tree(cft_cmdline, cft_tmp); /* Reload the global profile. */ - if (profile_name) { - if (!(profile = add_profile(cmd, profile_name)) || + if (profile_command_name) { + if (!(profile = add_profile(cmd, profile_command_name, CONFIG_PROFILE_COMMAND)) || + !override_config_tree_from_profile(cmd, profile)) + return_0; + } + if (profile_metadata_name) { + if (!(profile = add_profile(cmd, profile_metadata_name, CONFIG_PROFILE_METADATA)) || !override_config_tree_from_profile(cmd, profile)) return_0; } diff --git a/lib/config/config.c b/lib/config/config.c index 4b5c18c..4fbee66 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -38,7 +38,8 @@ static const char *_config_source_names[] = { [CONFIG_FILE] = "file", [CONFIG_MERGED_FILES] = "merged files", [CONFIG_STRING] = "string", - [CONFIG_PROFILE] = "profile", + [CONFIG_PROFILE_COMMAND] = "command profile", + [CONFIG_PROFILE_METADATA] = "metadata profile", [CONFIG_FILE_SPECIAL] = "special purpose" }; @@ -83,6 +84,19 @@ config_source_t config_get_source_type(struct dm_config_tree *cft) return cs ? cs->type : CONFIG_UNDEFINED; } +static inline int _is_profile_based_config_source(config_source_t source) +{ + return (source == CONFIG_PROFILE_COMMAND) || + (source == CONFIG_PROFILE_METADATA); +} + +static inline int _is_file_based_config_source(config_source_t source) +{ + return (source == CONFIG_FILE) || + (source == CONFIG_FILE_SPECIAL) || + _is_profile_based_config_source(source); +} + /* * public interface */ @@ -102,9 +116,7 @@ struct dm_config_tree *config_open(config_source_t source, goto fail; } - if ((source == CONFIG_FILE) || - (source == CONFIG_FILE_SPECIAL) || - (source == CONFIG_PROFILE)) { + if (_is_file_based_config_source(source)) { if (!(cf = dm_pool_zalloc(cft->mem, sizeof(struct config_file)))) { log_error("Failed to allocate config file."); goto fail; @@ -137,9 +149,7 @@ int config_file_check(struct dm_config_tree *cft, const char **filename, struct struct config_file *cf; struct stat _info; - if ((cs->type != CONFIG_FILE) && - (cs->type != CONFIG_PROFILE) && - (cs->type != CONFIG_FILE_SPECIAL)) { + if (!_is_file_based_config_source(cs->type)) { log_error(INTERNAL_ERROR "config_file_check: expected file, special file or " "profile config source, found %s config source.", _config_source_names[cs->type]); @@ -234,9 +244,7 @@ void config_destroy(struct dm_config_tree *cft) cs = dm_config_get_custom(cft); - if ((cs->type == CONFIG_FILE) || - (cs->type == CONFIG_PROFILE) || - (cs->type == CONFIG_FILE_SPECIAL)) { + if (_is_file_based_config_source(cs->type)) { cf = cs->source.file; if (cf && cf->dev) if (!dev_close(cf->dev)) @@ -261,7 +269,7 @@ struct dm_config_tree *config_file_open_and_read(const char *config_file, /* Is there a config file? */ if (stat(config_file, &info) == -1) { /* Profile file must be present! */ - if (errno == ENOENT && (source != CONFIG_PROFILE)) + if (errno == ENOENT && (!_is_profile_based_config_source(source))) return cft; log_sys_error("stat", config_file); goto bad; @@ -360,7 +368,7 @@ int override_config_tree_from_string(struct cmd_context *cmd, /* * Follow this sequence: - * CONFIG_STRING -> CONFIG_PROFILE -> CONFIG_FILE/CONFIG_MERGED_FILES + * CONFIG_STRING -> CONFIG_PROFILE_COMMAND -> CONFIG_PROFILE_METADATA -> CONFIG_FILE/CONFIG_MERGED_FILES */ if (cs->type == CONFIG_STRING) { @@ -388,39 +396,89 @@ int override_config_tree_from_string(struct cmd_context *cmd, return 1; } -int override_config_tree_from_profile(struct cmd_context *cmd, - struct profile *profile) +static int _override_config_tree_from_command_profile(struct cmd_context *cmd, + struct profile *profile) { - struct dm_config_tree *cft = cmd->cft, *cft_string = NULL; + struct dm_config_tree *cft = cmd->cft, *cft_previous = NULL; struct config_source *cs = dm_config_get_custom(cft); - /* - * Follow this sequence: - * CONFIG_STRING -> CONFIG_PROFILE -> CONFIG_FILE/CONFIG_MERGED_FILES - */ + if (cs->type == CONFIG_STRING) { + cft_previous = cft; + cft = cft->cascade; + cs = dm_config_get_custom(cft); + } - if (!profile->cft && !load_profile(cmd, profile)) - return_0; + if (cs->type == CONFIG_PROFILE_COMMAND) { + log_error(INTERNAL_ERROR "_override_config_tree_from_command_profile: " + "config cascade already contains a command profile config."); + return 0; + } + + if (cft_previous) + dm_config_insert_cascaded_tree(cft_previous, profile->cft); + else + cmd->cft = profile->cft; + + dm_config_insert_cascaded_tree(profile->cft, cft); + + return 1; +} + +static int _override_config_tree_from_metadata_profile(struct cmd_context *cmd, + struct profile *profile) +{ + struct dm_config_tree *cft = cmd->cft, *cft_previous = NULL; + struct config_source *cs = dm_config_get_custom(cft); if (cs->type == CONFIG_STRING) { - cft_string = cft; + cft_previous = cft; + cft = cft->cascade; + } + + if (cs->type == CONFIG_PROFILE_COMMAND) { + cft_previous = cft; cft = cft->cascade; cs = dm_config_get_custom(cft); - if (cs->type == CONFIG_PROFILE) { - log_error(INTERNAL_ERROR "override_config_tree_from_profile: " - "config cascade already contains a profile config."); - return 0; - } - dm_config_insert_cascaded_tree(cft_string, profile->cft); } - cmd->cft = dm_config_insert_cascaded_tree(profile->cft, cft); + cs = dm_config_get_custom(cft); + + if (cs->type == CONFIG_PROFILE_METADATA) { + log_error(INTERNAL_ERROR "_override_config_tree_from_metadata_profile: " + "config cascade already contains a metadata profile config."); + return 0; + } + + if (cft_previous) + dm_config_insert_cascaded_tree(cft_previous, profile->cft); + else + cmd->cft = profile->cft; - cmd->cft = cft_string ? : profile->cft; + dm_config_insert_cascaded_tree(profile->cft, cft); return 1; } +int override_config_tree_from_profile(struct cmd_context *cmd, + struct profile *profile) +{ + /* + * Follow this sequence: + * CONFIG_STRING -> CONFIG_PROFILE_COMMAND -> CONFIG_PROFILE_METADATA -> CONFIG_FILE/CONFIG_MERGED_FILES + */ + + if (!profile->cft && !load_profile(cmd, profile)) + return_0; + + if (profile->source == CONFIG_PROFILE_COMMAND) + return _override_config_tree_from_command_profile(cmd, profile); + else if (profile->source == CONFIG_PROFILE_METADATA) + return _override_config_tree_from_metadata_profile(cmd, profile); + + log_error(INTERNAL_ERROR "override_config_tree_from_profile: incorrect profile source type"); + return 0; +} + int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, off_t offset, size_t size, off_t offset2, size_t size2, checksum_fn_t checksum_fn, uint32_t checksum) @@ -432,9 +490,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, char *buf = NULL; struct config_source *cs = dm_config_get_custom(cft); - if ((cs->type != CONFIG_FILE) && - (cs->type != CONFIG_PROFILE) && - (cs->type != CONFIG_FILE_SPECIAL)) { + if (!_is_file_based_config_source(cs->type)) { log_error(INTERNAL_ERROR "config_file_read_fd: expected file, special file " "or profile config source, found %s config source.", _config_source_names[cs->type]); @@ -850,6 +906,48 @@ static int _config_def_check_node_value(struct cft_check_handle *handle, return 1; } +static int _config_def_check_node_is_profilable(struct cft_check_handle *handle, + const char *rp, struct dm_config_node *cn, + const cfg_def_item_t *def) +{ + uint16_t flags; + + if (!(def->flags & CFG_PROFILABLE)) { + log_warn_suppress(handle->suppress_messages, + "Configuration %s \"%s\" is not customizable by " + "a profile.", cn->v ? "option" : "section", rp); + return 0; + } + + flags = def->flags & ~CFG_PROFILABLE; + + /* + * Make sure there is no metadata profilable config in the command profile! + */ + if ((handle->source == CONFIG_PROFILE_COMMAND) && (flags & CFG_PROFILABLE_METADATA)) { + log_warn_suppress(handle->suppress_messages, + "Configuration %s \"%s\" is customizable by " + "metadata profile only, not command profile.", + cn->v ? "option" : "section", rp); + return 0; + } + + /* + * Make sure there is no command profilable config in the metadata profile! + * (sections do not need to be flagged with CFG_PROFILABLE_METADATA, the + * CFG_PROFILABLE is enough as sections may contain both types inside) + */ + if ((handle->source == CONFIG_PROFILE_METADATA) && cn->v && !(flags & CFG_PROFILABLE_METADATA)) { + log_warn_suppress(handle->suppress_messages, + "Configuration %s \"%s\" is customizable by " + "command profile only, not metadata profile.", + cn->v ? "option" : "section", rp); + return 0; + } + + return 1; +} + static int _config_def_check_node(struct cft_check_handle *handle, const char *vp, char *pvp, char *rp, char *prp, size_t buf_size, struct dm_config_node *cn) @@ -896,13 +994,9 @@ static int _config_def_check_node(struct cft_check_handle *handle, * in certain types of configuration trees as in some * the use of configuration is restricted, e.g. profiles... */ - if (handle->source == CONFIG_PROFILE && - !(def->flags & CFG_PROFILABLE)) { - log_warn_suppress(handle->suppress_messages, - "Configuration %s \"%s\" is not customizable by " - "a profile.", cn->v ? "option" : "section", rp); - return 0; - } + if (_is_profile_based_config_source(handle->source) && + !_config_def_check_node_is_profilable(handle, rp, cn, def)) + return_0; handle->status[def->id] |= CFG_VALID; return 1; @@ -1028,6 +1122,23 @@ out: return r; } +static int _apply_local_profile(struct cmd_context *cmd, struct profile *profile) +{ + if (!profile) + return 0; + + /* + * Global metadata profile overrides the local one. + * This simply means the "--metadataprofile" arg + * overrides any profile attached to VG/LV. + */ + if ((profile->source == CONFIG_PROFILE_METADATA) && + cmd->profile_params->global_metadata_profile) + return 0; + + return override_config_tree_from_profile(cmd, profile); +} + const struct dm_config_node *find_config_tree_node(struct cmd_context *cmd, int id, struct profile *profile) { cfg_def_item_t *item = cfg_def_get_item_p(id); @@ -1035,14 +1146,13 @@ const struct dm_config_node *find_config_tree_node(struct cmd_context *cmd, int int profile_applied = 0; const struct dm_config_node *cn; - if (profile && !cmd->profile_params->global_profile) - profile_applied = override_config_tree_from_profile(cmd, profile); - + profile_applied = _apply_local_profile(cmd, profile); _cfg_def_make_path(path, sizeof(path), item->id, item, 0); + cn = dm_config_tree_find_node(cmd->cft, path); if (profile_applied) - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, profile->source); return cn; } @@ -1054,9 +1164,7 @@ const char *find_config_tree_str(struct cmd_context *cmd, int id, struct profile int profile_applied = 0; const char *str; - if (profile && !cmd->profile_params->global_profile) - profile_applied = override_config_tree_from_profile(cmd, profile); - + profile_applied = _apply_local_profile(cmd, profile); _cfg_def_make_path(path, sizeof(path), item->id, item, 0); if (item->type != CFG_TYPE_STRING) @@ -1065,7 +1173,7 @@ const char *find_config_tree_str(struct cmd_context *cmd, int id, struct profile str = dm_config_tree_find_str(cmd->cft, path, cfg_def_get_default_value(cmd, item, CFG_TYPE_STRING, profile)); if (profile_applied) - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, profile->source); return str; } @@ -1077,9 +1185,7 @@ const char *find_config_tree_str_allow_empty(struct cmd_context *cmd, int id, st int profile_applied = 0; const char *str; - if (profile && !cmd->profile_params->global_profile) - profile_applied = override_config_tree_from_profile(cmd, profile); - + profile_applied = _apply_local_profile(cmd, profile); _cfg_def_make_path(path, sizeof(path), item->id, item, 0); if (item->type != CFG_TYPE_STRING) @@ -1090,7 +1196,7 @@ const char *find_config_tree_str_allow_empty(struct cmd_context *cmd, int id, st str = dm_config_tree_find_str_allow_empty(cmd->cft, path, cfg_def_get_default_value(cmd, item, CFG_TYPE_STRING, profile)); if (profile_applied) - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, profile->source); return str; } @@ -1102,9 +1208,7 @@ int find_config_tree_int(struct cmd_context *cmd, int id, struct profile *profil int profile_applied = 0; int i; - if (profile && !cmd->profile_params->global_profile) - profile_applied = override_config_tree_from_profile(cmd, profile); - + profile_applied = _apply_local_profile(cmd, profile); _cfg_def_make_path(path, sizeof(path), item->id, item, 0); if (item->type != CFG_TYPE_INT) @@ -1113,7 +1217,7 @@ int find_config_tree_int(struct cmd_context *cmd, int id, struct profile *profil i = dm_config_tree_find_int(cmd->cft, path, cfg_def_get_default_value(cmd, item, CFG_TYPE_INT, profile)); if (profile_applied) - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, profile->source); return i; } @@ -1125,9 +1229,7 @@ int64_t find_config_tree_int64(struct cmd_context *cmd, int id, struct profile * int profile_applied = 0; int i64; - if (profile && !cmd->profile_params->global_profile) - profile_applied = override_config_tree_from_profile(cmd, profile); - + profile_applied = _apply_local_profile(cmd, profile); _cfg_def_make_path(path, sizeof(path), item->id, item, 0); if (item->type != CFG_TYPE_INT) @@ -1136,7 +1238,7 @@ int64_t find_config_tree_int64(struct cmd_context *cmd, int id, struct profile * i64 = dm_config_tree_find_int64(cmd->cft, path, cfg_def_get_default_value(cmd, item, CFG_TYPE_INT, profile)); if (profile_applied) - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, profile->source); return i64; } @@ -1148,9 +1250,7 @@ float find_config_tree_float(struct cmd_context *cmd, int id, struct profile *pr int profile_applied = 0; float f; - if (profile && !cmd->profile_params->global_profile) - profile_applied = override_config_tree_from_profile(cmd, profile); - + profile_applied = _apply_local_profile(cmd, profile); _cfg_def_make_path(path, sizeof(path), item->id, item, 0); if (item->type != CFG_TYPE_FLOAT) @@ -1159,7 +1259,7 @@ float find_config_tree_float(struct cmd_context *cmd, int id, struct profile *pr f = dm_config_tree_find_float(cmd->cft, path, cfg_def_get_default_value(cmd, item, CFG_TYPE_FLOAT, profile)); if (profile_applied) - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, profile->source); return f; } @@ -1171,9 +1271,7 @@ int find_config_tree_bool(struct cmd_context *cmd, int id, struct profile *profi int profile_applied = 0; int b; - if (profile && !cmd->profile_params->global_profile) - profile_applied = override_config_tree_from_profile(cmd, profile); - + profile_applied = _apply_local_profile(cmd, profile); _cfg_def_make_path(path, sizeof(path), item->id, item, 0); if (item->type != CFG_TYPE_BOOL) @@ -1182,7 +1280,7 @@ int find_config_tree_bool(struct cmd_context *cmd, int id, struct profile *profi b = dm_config_tree_find_bool(cmd->cft, path, cfg_def_get_default_value(cmd, item, CFG_TYPE_BOOL, profile)); if (profile_applied) - remove_config_tree_by_source(cmd, CONFIG_PROFILE); + remove_config_tree_by_source(cmd, profile->source); return b; } @@ -1627,7 +1725,7 @@ static int _check_profile(struct cmd_context *cmd, struct profile *profile) handle->cmd = cmd; handle->cft = profile->cft; - handle->source = CONFIG_PROFILE; + handle->source = profile->source; /* the check is compulsory - allow only profilable items in a profile config! */ handle->force_check = 1; /* provide warning messages only if config/checks=1 */ @@ -1639,11 +1737,44 @@ static int _check_profile(struct cmd_context *cmd, struct profile *profile) return r; } -struct profile *add_profile(struct cmd_context *cmd, const char *profile_name) +static int _get_profile_from_list(struct dm_list *list, const char *profile_name, + config_source_t source, struct profile **profile_found) +{ + struct profile *profile; + + dm_list_iterate_items(profile, list) { + if (!strcmp(profile->name, profile_name)) { + if (profile->source == source) { + *profile_found = profile; + return 1; + } + log_error(INTERNAL_ERROR "Profile %s already added as " + "%s type, but requested type is %s.", + profile_name, + _config_source_names[profile->source], + _config_source_names[source]); + return 0; + } + } + + *profile_found = NULL; + return 1; +} + +struct profile *add_profile(struct cmd_context *cmd, const char *profile_name, config_source_t source) { struct profile *profile; /* Do some sanity checks first. */ + if (!_is_profile_based_config_source(source)) { + log_error(INTERNAL_ERROR "add_profile: incorrect configuration " + "source, expected %s or %s but %s requested", + _config_source_names[CONFIG_PROFILE_COMMAND], + _config_source_names[CONFIG_PROFILE_METADATA], + _config_source_names[source]); + return NULL; + } + if (!profile_name || !*profile_name) { log_error("Undefined profile name."); return NULL; @@ -1654,14 +1785,29 @@ struct profile *add_profile(struct cmd_context *cmd, const char *profile_name) return NULL; } - /* Check if the profile is added already... */ - dm_list_iterate_items(profile, &cmd->profile_params->profiles_to_load) { - if (!strcmp(profile->name, profile_name)) - return profile; - } - dm_list_iterate_items(profile, &cmd->profile_params->profiles) { - if (!strcmp(profile->name, profile_name)) - return profile; + /* + * Check if the profile is on the list of profiles to be loaded or if + * not found there, if it's on the list of already loaded profiles. + */ + if (!_get_profile_from_list(&cmd->profile_params->profiles_to_load, + profile_name, source, &profile)) + return_NULL; + + if (profile) + profile->source = source; + else if (!_get_profile_from_list(&cmd->profile_params->profiles, + profile_name, source, &profile)) + return_NULL; + + if (profile) { + if (profile->source != source) { + log_error(INTERNAL_ERROR "add_profile: loaded profile " + "has incorrect type, expected %s but %s found", + _config_source_names[source], + _config_source_names[profile->source]); + return NULL; + } + return profile; } if (!(profile = dm_pool_zalloc(cmd->libmem, sizeof(*profile)))) { @@ -1669,6 +1815,7 @@ struct profile *add_profile(struct cmd_context *cmd, const char *profile_name) return NULL; } + profile->source = source; profile->name = dm_pool_strdup(cmd->libmem, profile_name); dm_list_add(&cmd->profile_params->profiles_to_load, &profile->list); @@ -1693,11 +1840,9 @@ int load_profile(struct cmd_context *cmd, struct profile *profile) { return 0; } - if (!(profile->cft = config_file_open_and_read(profile_path, CONFIG_PROFILE, cmd))) + if (!(profile->cft = config_file_open_and_read(profile_path, profile->source, cmd))) return 0; - dm_list_move(&cmd->profile_params->profiles, &profile->list); - /* * *Profile must be valid* otherwise we'd end up with incorrect config! * If there were config items present that are not supposed to be @@ -1708,25 +1853,28 @@ int load_profile(struct cmd_context *cmd, struct profile *profile) { * for profiles! */ if (!_check_profile(cmd, profile)) { - log_error("Ignoring invalid configuration profile %s.", profile->name); - /* if invalid, cut the whole tree and leave it empty */ - dm_pool_free(profile->cft->mem, profile->cft->root); - profile->cft->root = NULL; + log_error("Ignoring invalid %s %s.", + _config_source_names[profile->source], profile->name); + config_destroy(profile->cft); + profile->cft = NULL; + return 0; } + dm_list_move(&cmd->profile_params->profiles, &profile->list); return 1; } int load_pending_profiles(struct cmd_context *cmd) { struct profile *profile, *temp_profile; + int r = 1; dm_list_iterate_items_safe(profile, temp_profile, &cmd->profile_params->profiles_to_load) { if (!load_profile(cmd, profile)) - return 0; + r = 0; } - return 1; + return r; } const char *get_default_devices_cache_dir_CFG(struct cmd_context *cmd, struct profile *profile) diff --git a/lib/config/config.h b/lib/config/config.h index f06fb68..0618045 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -30,21 +30,24 @@ typedef enum { CONFIG_FILE, /* one file config */ CONFIG_MERGED_FILES, /* config that is a result of merging more config files */ CONFIG_STRING, /* config string typed on cmdline using '--config' arg */ - CONFIG_PROFILE, /* profile config */ + CONFIG_PROFILE_COMMAND, /* command profile config */ + CONFIG_PROFILE_METADATA,/* metadata profile config */ CONFIG_FILE_SPECIAL /* special purpose file config (e.g. metadata, persistent filter...) */ } config_source_t; struct profile { struct dm_list list; + config_source_t source; /* either CONFIG_PROFILE_COMMAND or CONFIG_PROFILE_METADATA */ const char *name; struct dm_config_tree *cft; }; struct profile_params { - char dir[PATH_MAX]; /* subdir in LVM_SYSTEM_DIR where LVM looks for profiles */ - struct profile *global_profile; /* profile that overrides any other VG/LV-based profile ('--profile' cmd line arg) */ - struct dm_list profiles_to_load;/* list of profiles which are only added, but still need to be loaded for any use */ - struct dm_list profiles; /* list of profiles which are loaded already and which are ready for use */ + char dir[PATH_MAX]; /* subdir in LVM_SYSTEM_DIR where LVM looks for profiles */ + struct profile *global_command_profile; /* profile (as given by --commandprofile cmd arg) used as global command profile */ + struct profile *global_metadata_profile; /* profile (as given by --metadataprofile cmd arg) that overrides any other VG/LV-based profile */ + struct dm_list profiles_to_load; /* list of profiles which are only added, but still need to be loaded for any use */ + struct dm_list profiles; /* list of profiles which are loaded already and which are ready for use */ }; #define CFG_PATH_MAX_LEN 64 @@ -166,7 +169,7 @@ enum { #undef cfg_array_runtime }; -struct profile *add_profile(struct cmd_context *cmd, const char *profile_name); +struct profile *add_profile(struct cmd_context *cmd, const char *profile_name, config_source_t source); int load_profile(struct cmd_context *cmd, struct profile *profile); int load_pending_profiles(struct cmd_context *cmd); diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c index 59603bb..7d4304e 100644 --- a/lib/format_text/import_vsn1.c +++ b/lib/format_text/import_vsn1.c @@ -576,7 +576,7 @@ static int _read_lvnames(struct format_instance *fid __attribute__((unused)), if (dm_config_get_str(lvn, "profile", &str)) { log_debug_metadata("Adding profile configuration %s for LV %s/%s.", str, vg->name, lv->name); - lv->profile = add_profile(vg->cmd, str); + lv->profile = add_profile(vg->cmd, str, CONFIG_PROFILE_METADATA); if (!lv->profile) { log_error("Failed to add configuration profile %s for LV %s/%s", str, vg->name, lv->name); @@ -814,7 +814,7 @@ static struct volume_group *_read_vg(struct format_instance *fid, if (dm_config_get_str(vgn, "profile", &str)) { log_debug_metadata("Adding profile configuration %s for VG %s.", str, vg->name); - vg->profile = add_profile(vg->cmd, str); + vg->profile = add_profile(vg->cmd, str, CONFIG_PROFILE_METADATA); if (!vg->profile) { log_error("Failed to add configuration profile %s for VG %s", str, vg->name); goto bad; diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 0eaa719..91a15f2 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4525,7 +4525,7 @@ struct logical_volume *lv_create_empty(const char *name, goto_bad; if (vg->fid->fmt->features & FMT_CONFIG_PROFILE) - lv->profile = vg->cmd->profile_params->global_profile; + lv->profile = vg->cmd->profile_params->global_metadata_profile; return lv; bad: diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index 5382b69..84b93db 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -417,7 +417,7 @@ void critical_section_inc(struct cmd_context *cmd, const char *reason) * entering the critical section all needed profiles are * loaded to avoid the disk access later. */ - load_pending_profiles(cmd); + (void) load_pending_profiles(cmd); if (!_critical_section) { _critical_section = 1; diff --git a/tools/args.h b/tools/args.h index 2e63adb..6a594c3 100644 --- a/tools/args.h +++ b/tools/args.h @@ -99,6 +99,8 @@ arg(minrecoveryrate_ARG, '\0', "minrecoveryrate", size_kb_arg, 0) arg(raidminrecoveryrate_ARG, '\0', "raidminrecoveryrate", size_kb_arg, 0) arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", size_kb_arg, 0) arg(raidmaxrecoveryrate_ARG, '\0', "raidmaxrecoveryrate", size_kb_arg, 0) +arg(commandprofile_ARG, '\0', "commandprofile", string_arg, 0) +arg(metadataprofile_ARG, '\0', "metadataprofile", string_arg, 0) arg(profile_ARG, '\0', "profile", string_arg, 0) arg(detachprofile_ARG, '\0', "detachprofile", NULL, 0) arg(mergedconfig_ARG, '\0', "mergedconfig", NULL, 0) diff --git a/tools/commands.h b/tools/commands.h index 5a69e44..6ed4f8d 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -33,6 +33,7 @@ xx(devtypes, PERMITTED_READ_ONLY, "devtypes" "\n" "\t[--aligned]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--nameprefixes]\n" @@ -56,6 +57,7 @@ xx(dumpconfig, "Dump configuration", PERMITTED_READ_ONLY, "dumpconfig\n" + "\t[--commandprofile ProfileName]\n" "\t[-f|--file filename] \n" "\t[--type {current|default|diff|missing|new|profilable} \n" "\t[--atversion version]] \n" @@ -99,6 +101,7 @@ xx(lvchange, "\t[--addtag Tag]\n" "\t[--alloc AllocationPolicy]\n" "\t[-C|--contiguous y|n]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[--deltag Tag]\n" "\t[--detachprofile]\n" @@ -114,9 +117,9 @@ xx(lvchange, "\t[--poll {y|n}]\n" "\t[--noudevsync]\n" "\t[-M|--persistent y|n] [--major major] [--minor minor]\n" + "\t[--metadataprofile ProfileName]\n" "\t[-P|--partial] " "\n" "\t[-p|--permission r|rw]\n" - "\t[--profile ProfileName\n" "\t[--[raid]minrecoveryrate Rate]\n" "\t[--[raid]maxrecoveryrate Rate]\n" "\t[--[raid]syncaction {check|repair}\n" @@ -136,9 +139,9 @@ xx(lvchange, addtag_ARG, alloc_ARG, autobackup_ARG, activate_ARG, available_ARG, contiguous_ARG, deltag_ARG, discards_ARG, detachprofile_ARG, force_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG, ignoreactivationskip_ARG, - ignoreskippedcluster_ARG, - major_ARG, minor_ARG, monitor_ARG, minrecoveryrate_ARG, maxrecoveryrate_ARG, - noudevsync_ARG, partial_ARG, permission_ARG, persistent_ARG, poll_ARG, + ignoreskippedcluster_ARG, major_ARG, metadataprofile_ARG, minor_ARG, + monitor_ARG, minrecoveryrate_ARG, maxrecoveryrate_ARG, noudevsync_ARG, + partial_ARG, permission_ARG, persistent_ARG, poll_ARG, raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG, raidsyncaction_ARG, raidwritebehind_ARG, raidwritemostly_ARG, readahead_ARG, resync_ARG, refresh_ARG, setactivationskip_ARG, syncaction_ARG, sysinit_ARG, test_ARG, @@ -155,6 +158,7 @@ xx(lvconvert, "\t[-R|--regionsize MirrorLogRegionSize]\n" "\t[--alloc AllocationPolicy]\n" "\t[-b|--background]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|-?|--help]\n" @@ -169,10 +173,12 @@ xx(lvconvert, "lvconvert " "[--splitmirrors Images --trackchanges]\n" "[--splitmirrors Images --name SplitLogicalVolumeName]\n" + "\t[--commandprofile ProfileName]\n" "\tLogicalVolume[Path] [SplittablePhysicalVolume[Path]...]\n\n" "lvconvert " "--splitsnapshot\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|-?|--help]\n" "\t[--noudevsync]\n" @@ -183,6 +189,7 @@ xx(lvconvert, "lvconvert " "[-s|--snapshot]\n" "\t[-c|--chunksize]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|-?|--help]\n" "\t[--noudevsync]\n" @@ -195,6 +202,7 @@ xx(lvconvert, "--merge\n" "\t[-b|--background]\n" "\t[-i|--interval seconds]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|-?|--help]\n" "\t[-v|--verbose]\n" @@ -212,6 +220,7 @@ xx(lvconvert, "\t[-T|--thin ExternalLogicalVolume[Path]\n" "\t [--originname NewExternalOriginVolumeName]]\n" "\t[-Z|--zero {y|n}]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] [-h|-?|--help] [-v|--verbose]\n\n" "lvconvert " @@ -221,11 +230,13 @@ xx(lvconvert, "\t[--poolmetadata CacheMetadataLogicalVolume[Path] |\n" "\t [--poolmetadatasize size]\n" "\t [--poolmetadataspare {y|n}]]\n" + "\t[--commandprofile ProfileName]\n" "\tCacheDataLogicalVolume[Path]\n\n" "lvconvert " "--type cache\n" "\t--cachepool CachePoolLogicalVolume[Path]\n" + "\t[--commandprofile ProfileName]\n" "\tLogicalVolume[Path]\n\n", alloc_ARG, background_ARG, cachemode_ARG, cachepool_ARG, chunksize_ARG, @@ -246,6 +257,7 @@ xx(lvcreate, "\t[--alloc AllocationPolicy]\n" "\t[--cachemode CacheMode]\n" "\t[-C|--contiguous {y|n}]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|-?|--help]\n" "\t[--ignoremonitoring]\n" @@ -256,6 +268,7 @@ xx(lvcreate, "\t{-l|--extents LogicalExtentsNumber[%{VG|PVS|FREE}] |\n" "\t -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n" "\t[-M|--persistent {y|n}] [--major major] [--minor minor]\n" + "\t[--metadataprofile ProfileName]\n" "\t[-m|--mirrors Mirrors [--nosync] [{--mirrorlog {disk|core|mirrored}|--corelog}]]\n" "\t[-n|--name LogicalVolumeName]\n" "\t[--noudevsync]\n" @@ -287,6 +300,7 @@ xx(lvcreate, "\t[--addtag Tag]\n" "\t[--alloc AllocationPolicy]\n" "\t[-C|--contiguous {y|n}]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[--discards {ignore|nopassdown|passdown}]\n" "\t[-h|-?|--help]\n" @@ -299,6 +313,7 @@ xx(lvcreate, "\t -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n" "\t[--poolmetadatasize MetadataVolumeSize[bBsSkKmMgG]]\n" "\t[-M|--persistent {y|n}] [--major major] [--minor minor]\n" + "\t[--metadataprofile ProfileName]\n" "\t[-n|--name LogicalVolumeName]\n" "\t[--noudevsync]\n" "\t[-p|--permission {r|rw}]\n" @@ -313,14 +328,13 @@ xx(lvcreate, addtag_ARG, alloc_ARG, autobackup_ARG, activate_ARG, available_ARG, cachemode_ARG, chunksize_ARG, contiguous_ARG, corelog_ARG, discards_ARG, extents_ARG, ignoreactivationskip_ARG, ignoremonitoring_ARG, major_ARG, - minor_ARG, mirrorlog_ARG, mirrors_ARG, monitor_ARG, minrecoveryrate_ARG, - maxrecoveryrate_ARG, name_ARG, nosync_ARG, noudevsync_ARG, - permission_ARG, persistent_ARG, poolmetadatasize_ARG, poolmetadataspare_ARG, - raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG, readahead_ARG, - regionsize_ARG, setactivationskip_ARG, size_ARG, snapshot_ARG, stripes_ARG, - stripesize_ARG, test_ARG, thin_ARG, thinpool_ARG, - type_ARG, virtualoriginsize_ARG, virtualsize_ARG, - wipesignatures_ARG, zero_ARG) + metadataprofile_ARG, minor_ARG, mirrorlog_ARG, mirrors_ARG, monitor_ARG, + minrecoveryrate_ARG, maxrecoveryrate_ARG, name_ARG, nosync_ARG, + noudevsync_ARG, permission_ARG, persistent_ARG, poolmetadatasize_ARG, + poolmetadataspare_ARG, raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG, + readahead_ARG, regionsize_ARG, setactivationskip_ARG, size_ARG, snapshot_ARG, + stripes_ARG, stripesize_ARG, test_ARG, thin_ARG, thinpool_ARG, type_ARG, + virtualoriginsize_ARG, virtualsize_ARG, wipesignatures_ARG, zero_ARG) xx(lvdisplay, "Display information about a logical volume", @@ -328,6 +342,7 @@ xx(lvdisplay, "lvdisplay\n" "\t[-a|--all]\n" "\t[-c|--colon]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -344,6 +359,7 @@ xx(lvdisplay, "lvdisplay --columns|-C\n" "\t[--aligned]\n" "\t[-a|--all]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -373,6 +389,7 @@ xx(lvextend, "lvextend\n" "\t[-A|--autobackup y|n]\n" "\t[--alloc AllocationPolicy]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" @@ -401,6 +418,7 @@ xx(lvmchange, "With the device mapper, this is obsolete and does nothing.", 0, "lvmchange\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[-R|--reset]\n" @@ -413,6 +431,7 @@ xx(lvmdiskscan, "List devices that may be used as physical volumes", PERMITTED_READ_ONLY, "lvmdiskscan\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[-l|--lvmpartition]\n" @@ -425,6 +444,7 @@ xx(lvmsadc, "Collect activity data", 0, "lvmsadc\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[-v|--verbose]\n" @@ -435,6 +455,7 @@ xx(lvmsar, "Create activity report", 0, "lvmsar\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--full]\n" "\t[-h|--help]\n" @@ -450,6 +471,7 @@ xx(lvreduce, 0, "lvreduce\n" "\t[-A|--autobackup y|n]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" @@ -472,6 +494,7 @@ xx(lvremove, 0, "lvremove\n" "\t[-A|--autobackup y|n]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" @@ -488,6 +511,7 @@ xx(lvrename, 0, "lvrename\n" "\t[-A|--autobackup {y|n}] " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-h|-?|--help] " "\n" "\t[--noudevsync]\n" @@ -505,6 +529,7 @@ xx(lvresize, "lvresize\n" "\t[-A|--autobackup y|n]\n" "\t[--alloc AllocationPolicy]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" @@ -532,6 +557,7 @@ xx(lvs, "lvs" "\n" "\t[-a|--all]\n" "\t[--aligned]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -567,6 +593,7 @@ xx(lvscan, "lvscan " "\n" "\t[-a|--all]\n" "\t[-b|--blockdevice] " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-h|-?|--help] " "\n" "\t[--ignorelockingfailure]\n" @@ -584,6 +611,7 @@ xx(pvchange, "pvchange\n" "\t[-a|--all]\n" "\t[-A|--autobackup y|n]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" @@ -604,6 +632,7 @@ xx(pvresize, "Resize physical volume(s)", 0, "pvresize " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]" "\n" "\t[-h|-?|--help] " "\n" "\t[--setphysicalvolumesize PhysicalVolumeSize[bBsSkKmMgGtTpPeE]" "\n" @@ -618,6 +647,7 @@ xx(pvck, "Check the consistency of physical volume(s)", 0, "pvck " + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--labelsector sector] " "\n" @@ -633,6 +663,7 @@ xx(pvcreate, "pvcreate " "\n" "\t[--norestorefile]\n" "\t[--restorefile file]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]" "\n" "\t[-f[f]|--force [--force]] " "\n" "\t[-h|-?|--help] " "\n" @@ -663,6 +694,7 @@ xx(pvdata, 0, "pvdata " "\n" "\t[-a|--all] " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-E|--physicalextent] " "\n" "\t[-h|-?|--help]" "\n" @@ -682,6 +714,7 @@ xx(pvdisplay, CACHE_VGMETADATA | PERMITTED_READ_ONLY, "pvdisplay\n" "\t[-c|--colon]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -698,6 +731,7 @@ xx(pvdisplay, "pvdisplay --columns|-C\n" "\t[--aligned]\n" "\t[-a|--all]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -727,6 +761,7 @@ xx(pvmove, "\t[-A|--autobackup {y|n}]\n" "\t[--alloc AllocationPolicy]\n" "\t[-b|--background]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n " "\t[-h|-?|--help]\n" "\t[-i|--interval seconds]\n" @@ -746,6 +781,7 @@ xx(pvremove, "Remove LVM label(s) from physical volume(s)", 0, "pvremove " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]" "\n" "\t[-f[f]|--force [--force]] " "\n" "\t[-h|-?|--help] " "\n" @@ -763,6 +799,7 @@ xx(pvs, "pvs" "\n" "\t[-a|--all]\n" "\t[--aligned]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]" "\n" "\t[-h|-?|--help] " "\n" "\t[--ignorelockingfailure]\n" @@ -796,6 +833,7 @@ xx(pvscan, "pvscan " "\n" "\t[-b|--background]\n" "\t[--cache [-a|--activate ay] [ DevicePath | --major major --minor minor]...]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t{-e|--exported | -n|--novolumegroup} " "\n" "\t[-h|-?|--help]" "\n" @@ -825,6 +863,7 @@ xx(vgcfgbackup, "Backup volume group configuration(s)", PERMITTED_READ_ONLY, "vgcfgbackup " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-f|--file filename] " "\n" "\t[-h|-?|--help] " "\n" @@ -841,6 +880,7 @@ xx(vgcfgrestore, "Restore volume group configuration", 0, "vgcfgrestore " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-f|--file filename] " "\n" "\t[--force]\n" @@ -861,6 +901,7 @@ xx(vgchange, "\t[-A|--autobackup {y|n}] " "\n" "\t[--alloc AllocationPolicy] " "\n" "\t[-P|--partial] " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[--detachprofile] " "\n" "\t[-h|--help] " "\n" @@ -868,6 +909,7 @@ xx(vgchange, "\t[--ignoremonitoring]\n" "\t[--ignoreskippedcluster]\n" "\t[-K|--ignoreactivationskip] \n" + "\t[--metadataprofile ProfileName]\n" "\t[--monitor {y|n}]\n" "\t[--[vg]metadatacopies #copies] " "\n" "\t[--poll {y|n}]\n" @@ -884,7 +926,6 @@ xx(vgchange, "\t -l|--logicalvolume MaxLogicalVolumes |" "\n" "\t -p|--maxphysicalvolumes MaxPhysicalVolumes |" "\n" "\t -s|--physicalextentsize PhysicalExtentSize[bBsSkKmMgGtTpPeE] |" "\n" - "\t[--profile ProfileName\n" "\t --addtag Tag |\n" "\t --deltag Tag}\n" "\t[VolumeGroupName...]\n", @@ -892,16 +933,16 @@ xx(vgchange, addtag_ARG, alloc_ARG, allocation_ARG, autobackup_ARG, activate_ARG, available_ARG, clustered_ARG, deltag_ARG, detachprofile_ARG, ignoreactivationskip_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG, - ignoreskippedcluster_ARG, - logicalvolume_ARG, maxphysicalvolumes_ARG, monitor_ARG, noudevsync_ARG, - metadatacopies_ARG, vgmetadatacopies_ARG, partial_ARG, - physicalextentsize_ARG, poll_ARG, refresh_ARG, resizeable_ARG, - resizable_ARG, sysinit_ARG, test_ARG, uuid_ARG) + ignoreskippedcluster_ARG, logicalvolume_ARG, maxphysicalvolumes_ARG, + metadataprofile_ARG, monitor_ARG, noudevsync_ARG, metadatacopies_ARG, + vgmetadatacopies_ARG, partial_ARG, physicalextentsize_ARG, poll_ARG, + refresh_ARG, resizeable_ARG, resizable_ARG, sysinit_ARG, test_ARG, uuid_ARG) xx(vgck, "Check the consistency of volume group(s)", 0, "vgck " + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[-v|--verbose]\n" @@ -912,6 +953,7 @@ xx(vgconvert, "Change volume group metadata format", 0, "vgconvert " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]" "\n" "\t[-h|--help] " "\n" "\t[--labelsector sector] " "\n" @@ -936,9 +978,11 @@ xx(vgcreate, "\t[--addtag Tag] " "\n" "\t[--alloc AllocationPolicy] " "\n" "\t[-c|--clustered {y|n}] " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]" "\n" "\t[-h|--help]" "\n" "\t[-l|--maxlogicalvolumes MaxLogicalVolumes]" "\n" + "\t[--metadataprofile ProfileName]\n" "\t[-M|--metadatatype 1|2] " "\n" "\t[--[vg]metadatacopies #copies] " "\n" "\t[-p|--maxphysicalvolumes MaxPhysicalVolumes] " "\n" @@ -951,10 +995,10 @@ xx(vgcreate, "\tVolumeGroupName PhysicalDevicePath [PhysicalDevicePath...]\n", addtag_ARG, alloc_ARG, autobackup_ARG, clustered_ARG, maxlogicalvolumes_ARG, - maxphysicalvolumes_ARG, metadatatype_ARG, physicalextentsize_ARG, test_ARG, - force_ARG, zero_ARG, labelsector_ARG, metadatasize_ARG, - pvmetadatacopies_ARG, metadatacopies_ARG, vgmetadatacopies_ARG, - dataalignment_ARG, dataalignmentoffset_ARG) + maxphysicalvolumes_ARG, metadataprofile_ARG, metadatatype_ARG, + physicalextentsize_ARG, test_ARG, force_ARG, zero_ARG, labelsector_ARG, + metadatasize_ARG, pvmetadatacopies_ARG, metadatacopies_ARG, + vgmetadatacopies_ARG, dataalignment_ARG, dataalignmentoffset_ARG) xx(vgdisplay, "Display volume group information", @@ -962,6 +1006,7 @@ xx(vgdisplay, "vgdisplay " "\n" "\t[-A|--activevolumegroups]" "\n" "\t[-c|--colon | -s|--short | -v|--verbose]" "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-h|--help] " "\n" "\t[--ignorelockingfailure]" "\n" @@ -975,6 +1020,7 @@ xx(vgdisplay, "\n" "vgdisplay --columns|-C\n" "\t[--aligned]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-h|--help] " "\n" "\t[--ignorelockingfailure]" "\n" @@ -1002,6 +1048,7 @@ xx(vgexport, 0, "vgexport " "\n" "\t[-a|--all] " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-h|--help]" "\n" "\t[-v|--verbose] " "\n" @@ -1016,6 +1063,7 @@ xx(vgextend, "vgextend\n" "\t[-A|--autobackup y|n]\n" "\t[--restoremissing]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" @@ -1037,6 +1085,7 @@ xx(vgimport, 0, "vgimport " "\n" "\t[-a|--all]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-f|--force] " "\n" "\t[-h|--help] " "\n" @@ -1052,6 +1101,7 @@ xx(vgmerge, 0, "vgmerge\n" "\t[-A|--autobackup y|n]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[-l|--list]\n" @@ -1066,6 +1116,7 @@ xx(vgmknodes, "Create the special files for volume group devices in /dev", 0, "vgmknodes\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -1082,6 +1133,7 @@ xx(vgreduce, "vgreduce\n" "\t[-a|--all]\n" "\t[-A|--autobackup y|n]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--mirrorsonly]\n" @@ -1100,6 +1152,7 @@ xx(vgremove, "Remove volume group(s)", 0, "vgremove\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" @@ -1116,6 +1169,7 @@ xx(vgrename, 0, "vgrename\n" "\t[-A|--autobackup y|n]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[-t|--test]\n" @@ -1132,6 +1186,7 @@ xx(vgs, "vgs" "\n" "\t[--aligned]\n" "\t[-a|--all]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -1165,6 +1220,7 @@ xx(vgscan, PERMITTED_READ_ONLY, "vgscan " "\t[--cache]\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug]\n" "\t[-h|--help]\n" "\t[--ignorelockingfailure]\n" @@ -1182,6 +1238,7 @@ xx(vgsplit, "\t[-A|--autobackup {y|n}] " "\n" "\t[--alloc AllocationPolicy] " "\n" "\t[-c|--clustered {y|n}] " "\n" + "\t[--commandprofile ProfileName]\n" "\t[-d|--debug] " "\n" "\t[-h|--help] " "\n" "\t[-l|--maxlogicalvolumes MaxLogicalVolumes]" "\n" diff --git a/tools/lvchange.c b/tools/lvchange.c index bddc079..48e48d4 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -898,8 +898,11 @@ static int lvchange_profile(struct logical_volume *lv) new_profile_name = "(inherited)"; lv->profile = NULL; } else { - new_profile_name = arg_str_value(lv->vg->cmd, profile_ARG, NULL); - if (!(new_profile = add_profile(lv->vg->cmd, new_profile_name))) + if (arg_count(lv->vg->cmd, metadataprofile_ARG)) + new_profile_name = arg_str_value(lv->vg->cmd, metadataprofile_ARG, NULL); + else + new_profile_name = arg_str_value(lv->vg->cmd, profile_ARG, NULL); + if (!(new_profile = add_profile(lv->vg->cmd, new_profile_name, CONFIG_PROFILE_METADATA))) return_0; lv->profile = new_profile; } @@ -944,7 +947,8 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, (arg_count(cmd, contiguous_ARG) || arg_count(cmd, permission_ARG) || arg_count(cmd, readahead_ARG) || arg_count(cmd, persistent_ARG) || arg_count(cmd, discards_ARG) || arg_count(cmd, zero_ARG) || - arg_count(cmd, alloc_ARG) || arg_count(cmd, profile_ARG))) { + arg_count(cmd, alloc_ARG) || arg_count(cmd, profile_ARG) || + arg_count(cmd, metadataprofile_ARG))) { log_error("Only -a permitted with read-only volume " "group \"%s\"", lv->vg->name); return EINVALID_CMD_LINE; @@ -958,7 +962,8 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, if (lv_is_origin(lv) && !lv_is_thin_volume(lv) && (arg_count(cmd, contiguous_ARG) || arg_count(cmd, permission_ARG) || arg_count(cmd, readahead_ARG) || arg_count(cmd, persistent_ARG) || - arg_count(cmd, alloc_ARG) || arg_count(cmd, profile_ARG))) { + arg_count(cmd, alloc_ARG) || arg_count(cmd, profile_ARG) || + arg_count(cmd, metadataprofile_ARG))) { log_error("Can't change logical volume \"%s\" under snapshot", lv->name); return ECMD_FAILED; @@ -1108,7 +1113,8 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, } /* change configuration profile */ - if (arg_count(cmd, profile_ARG) || arg_count(cmd, detachprofile_ARG)) { + if (arg_count(cmd, profile_ARG) || arg_count(cmd, metadataprofile_ARG) || + arg_count(cmd, detachprofile_ARG)) { if (!archive(lv->vg)) return_ECMD_FAILED; doit += lvchange_profile(lv); @@ -1170,6 +1176,7 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv) arg_count(cmd, persistent_ARG) || arg_count(cmd, addtag_ARG) || arg_count(cmd, deltag_ARG) || + arg_count(cmd, metadataprofile_ARG) || arg_count(cmd, profile_ARG) || arg_count(cmd, detachprofile_ARG) || arg_count(cmd, setactivationskip_ARG); @@ -1194,8 +1201,9 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } - if (arg_count(cmd, profile_ARG) && arg_count(cmd, detachprofile_ARG)) { - log_error("Only one of --profile and --detachprofile permitted."); + if ((arg_count(cmd, profile_ARG) || arg_count(cmd, metadataprofile_ARG)) && + arg_count(cmd, detachprofile_ARG)) { + log_error("Only one of --metadataprofile and --detachprofile permitted."); return EINVALID_CMD_LINE; } diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 69e5781..96e478f 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -622,6 +622,7 @@ void lvm_register_commands(void) version_ARG, verbose_ARG, \ yes_ARG, \ quiet_ARG, config_ARG, \ + commandprofile_ARG, \ profile_ARG, -1); #include "commands.h" #undef xx @@ -1079,10 +1080,122 @@ static const char *_copy_command_line(struct cmd_context *cmd, int argc, char ** return NULL; } -int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) +static int _prepare_profiles(struct cmd_context *cmd) { - struct dm_config_tree *config_string_cft, *config_profile_cft; + static const char _failed_to_add_profile_msg[] = "Failed to add %s %s."; + static const char _failed_to_apply_profile_msg[] = "Failed to apply %s %s."; + static const char _command_profile_source_name[] = "command profile"; + static const char _metadata_profile_source_name[] = "metadata profile"; + static const char _setting_global_profile_msg[] = "Setting global %s \"%s\"."; + + const char *name; struct profile *profile; + config_source_t source; + const char *source_name; + + if (arg_count(cmd, profile_ARG)) { + /* + * If --profile is used with dumpconfig, it's used + * to dump the profile without the profile being applied. + */ + if (!strcmp(cmd->command->name, "dumpconfig")) + return 1; + + /* + * If --profile is used with lvcreate/lvchange/vgchange, + * it's recognized as shortcut to --metadataprofile. + * The --commandprofile is assumed otherwise. + */ + if (!strcmp(cmd->command->name, "lvcreate") || + !strcmp(cmd->command->name, "vgcreate") || + !strcmp(cmd->command->name, "lvchange") || + !strcmp(cmd->command->name, "vgchange")) { + if (arg_count(cmd, metadataprofile_ARG)) { + log_error("Only one of --profile or " + " --metadataprofile allowed."); + return 0; + } + source = CONFIG_PROFILE_METADATA; + source_name = _metadata_profile_source_name; + } + else { + if (arg_count(cmd, commandprofile_ARG)) { + log_error("Only one of --profile or " + "--commandprofile allowed."); + return 0; + } + source = CONFIG_PROFILE_COMMAND; + source_name = _command_profile_source_name; + } + + name = arg_str_value(cmd, profile_ARG, NULL); + + if (!(profile = add_profile(cmd, name, source))) { + log_error(_failed_to_add_profile_msg, source_name, name); + return 0; + } + + if (source == CONFIG_PROFILE_COMMAND) { + log_debug(_setting_global_profile_msg, _command_profile_source_name, profile->name); + cmd->profile_params->global_command_profile = profile; + } else if (source == CONFIG_PROFILE_METADATA) { + log_debug(_setting_global_profile_msg, _metadata_profile_source_name, profile->name); + /* This profile will override any VG/LV-based profile if present */ + cmd->profile_params->global_metadata_profile = profile; + } + + if (!override_config_tree_from_profile(cmd, profile)) { + log_error(_failed_to_apply_profile_msg, source_name, name); + return 0; + } + + } + + if (arg_count(cmd, commandprofile_ARG)) { + name = arg_str_value(cmd, commandprofile_ARG, NULL); + source_name = _command_profile_source_name; + + if (!(profile = add_profile(cmd, name, CONFIG_PROFILE_COMMAND))) { + log_error(_failed_to_add_profile_msg, source_name, name); + return 0; + } + if (!override_config_tree_from_profile(cmd, profile)) { + log_error(_failed_to_apply_profile_msg, source_name, name); + return 0; + } + + log_debug(_setting_global_profile_msg, _command_profile_source_name, profile->name); + cmd->profile_params->global_command_profile = profile; + } + + + if (arg_count(cmd, metadataprofile_ARG)) { + name = arg_str_value(cmd, metadataprofile_ARG, NULL); + source_name = _metadata_profile_source_name; + + if (!(profile = add_profile(cmd, name, CONFIG_PROFILE_METADATA))) { + log_error(_failed_to_add_profile_msg, source_name, name); + return 0; + } + if (!override_config_tree_from_profile(cmd, profile)) { + log_error(_failed_to_apply_profile_msg, source_name, name); + return 0; + } + + log_debug(_setting_global_profile_msg, _metadata_profile_source_name, profile->name); + cmd->profile_params->global_metadata_profile = profile; + } + + if (!process_profilable_config(cmd)) + return_0; + + return 1; +} + +int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) +{ + struct dm_config_tree *config_string_cft; + struct dm_config_tree *config_profile_command_cft, *config_profile_metadata_cft; int ret = 0; int locking_type; int monitoring; @@ -1131,19 +1244,10 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) } } - if (arg_count(cmd, profile_ARG)) { - if (!(profile = add_profile(cmd, arg_str_value(cmd, profile_ARG, NULL)))) { - log_error("Failed to add configuration profile."); - return ECMD_FAILED; - } - log_debug("Setting global configuration profile \"%s\".", profile->name); - /* This profile will override any VG/LV-based profile if present */ - cmd->profile_params->global_profile = profile; - if (!override_config_tree_from_profile(cmd, profile)) { - log_error("Failed to apply configuration profile."); - return ECMD_FAILED; - } - if (!process_profilable_config(cmd)) + if (arg_count(cmd, profile_ARG) || + arg_count(cmd, commandprofile_ARG) || + arg_count(cmd, metadataprofile_ARG)) { + if (!_prepare_profiles(cmd)) return_ECMD_FAILED; } @@ -1206,10 +1310,11 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) if ((config_string_cft = remove_config_tree_by_source(cmd, CONFIG_STRING))) dm_config_destroy(config_string_cft); - config_profile_cft = remove_config_tree_by_source(cmd, CONFIG_PROFILE); - cmd->profile_params->global_profile = NULL; + config_profile_command_cft = remove_config_tree_by_source(cmd, CONFIG_PROFILE_COMMAND); + config_profile_metadata_cft = remove_config_tree_by_source(cmd, CONFIG_PROFILE_METADATA); + cmd->profile_params->global_metadata_profile = NULL; - if (config_string_cft || config_profile_cft) { + if (config_string_cft || config_profile_command_cft || config_profile_metadata_cft) { /* Move this? */ if (!refresh_toolcontext(cmd)) stack; diff --git a/tools/vgchange.c b/tools/vgchange.c index d24b17e..05e7aea 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -441,8 +441,11 @@ static int _vgchange_profile(struct cmd_context *cmd, new_profile_name = "(no profile)"; vg->profile = NULL; } else { - new_profile_name = arg_str_value(cmd, profile_ARG, NULL); - if (!(new_profile = add_profile(cmd, new_profile_name))) + if (arg_count(cmd, metadataprofile_ARG)) + new_profile_name = arg_str_value(cmd, metadataprofile_ARG, NULL); + else + new_profile_name = arg_str_value(cmd, profile_ARG, NULL); + if (!(new_profile = add_profile(cmd, new_profile_name, CONFIG_PROFILE_METADATA))) return_0; vg->profile = new_profile; } @@ -473,6 +476,7 @@ static int vgchange_single(struct cmd_context *cmd, const char *vg_name, { alloc_ARG, &_vgchange_alloc }, { clustered_ARG, &_vgchange_clustered }, { vgmetadatacopies_ARG, &_vgchange_metadata_copies }, + { metadataprofile_ARG, &_vgchange_profile }, { profile_ARG, &_vgchange_profile}, { detachprofile_ARG, &_vgchange_profile}, }; @@ -547,6 +551,7 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) int update_partial_safe = arg_count(cmd, deltag_ARG) || arg_count(cmd, addtag_ARG) || + arg_count(cmd, metadataprofile_ARG) || arg_count(cmd, profile_ARG) || arg_count(cmd, detachprofile_ARG); int update_partial_unsafe = @@ -572,8 +577,9 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } - if (arg_count(cmd, profile_ARG) && arg_count(cmd, detachprofile_ARG)) { - log_error("Only one of --profile and --detachprofile permitted."); + if ((arg_count(cmd, profile_ARG) || arg_count(cmd, metadataprofile_ARG)) && + arg_count(cmd, detachprofile_ARG)) { + log_error("Only one of --metadataprofile and --detachprofile permitted."); return EINVALID_CMD_LINE; } diff --git a/tools/vgcreate.c b/tools/vgcreate.c index 45f4c04..9d701c8 100644 --- a/tools/vgcreate.c +++ b/tools/vgcreate.c @@ -63,7 +63,7 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) } if (vg->fid->fmt->features & FMT_CONFIG_PROFILE) - vg->profile = vg->cmd->profile_params->global_profile; + vg->profile = vg->cmd->profile_params->global_metadata_profile; if (!vg_set_extent_size(vg, vp_new.extent_size) || !vg_set_max_lv(vg, vp_new.max_lv) ||

1 0

master - config: add CFG_PROFILABLE_METADATA flag
by Peter Rajnoha 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c5fbd2c59f1248b1… Commit: c5fbd2c59f1248b1315aae71dee032878d8476f8 Parent: 22cab9c481c853cb58aef4b5836f74b3ddfd586c Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon May 19 16:29:50 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon May 19 16:31:15 2014 +0200 config: add CFG_PROFILABLE_METADATA flag Mark profilable settings with a separate CFG_PROFILABLE_METADATA flag where the profile can be attached to VG/LV. This makes it possible to differentiate global command-profilable settings (CFG_PROFILABLE flag) and contextual metadata-profilable (per VG/LV) settings (CFG_PROFILABLE_METADATA flag). --- lib/config/config.h | 8 ++++++-- lib/config/config_settings.h | 13 +++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/config/config.h b/lib/config/config.h index df5841c..f06fb68 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -97,10 +97,14 @@ typedef union { #define CFG_UNSUPPORTED 0x08 /* whether the configuration item is customizable by a profile */ #define CFG_PROFILABLE 0x10 +/* whether the configuration item is customizable by a profile */ +/* and whether it can be attached to VG/LV metadata at the same time + * The CFG_PROFILABLE_METADATA flag incorporates CFG_PROFILABLE flag!!! */ +#define CFG_PROFILABLE_METADATA 0x30 /* whether the default value is undefned */ -#define CFG_DEFAULT_UNDEFINED 0x20 +#define CFG_DEFAULT_UNDEFINED 0x40 /* whether the defualt value is calculated during run time */ -#define CFG_DEFAULT_RUN_TIME 0x40 +#define CFG_DEFAULT_RUN_TIME 0x80 /* configuration definition item structure */ typedef struct cfg_def_item { diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 3792238..d277e0e 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -41,6 +41,7 @@ * CFG_ADVANCED - this node belongs to advanced config set * CFG_UNSUPPORTED - this node belongs to unsupported config set * CFG_PROFILABLE - this node is customizable by a profile + * CFG_PROFILABLE_METADATA - profilable and attachable to VG/LV metadata * CFG_DEFAULT_UNDEFINED - node's default value is undefined * type: allowed type for the value of simple configuation setting, one of: * CFG_TYPE_BOOL @@ -121,10 +122,10 @@ cfg(allocation_mirror_logs_require_separate_pvs_CFG, "mirror_logs_require_separa cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL) cfg_runtime(allocation_cache_pool_chunk_size_CFG, "cache_pool_chunk_size", allocation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 106), NULL) cfg(allocation_thin_pool_metadata_require_separate_pvs_CFG, "thin_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 89), NULL) -cfg(allocation_thin_pool_zero_CFG, "thin_pool_zero", allocation_CFG_SECTION, CFG_PROFILABLE, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_ZERO, vsn(2, 2, 99), NULL) -cfg(allocation_thin_pool_discards_CFG, "thin_pool_discards", allocation_CFG_SECTION, CFG_PROFILABLE, CFG_TYPE_STRING, DEFAULT_THIN_POOL_DISCARDS, vsn(2, 2, 99), NULL) -cfg(allocation_thin_pool_chunk_size_policy_CFG, "thin_pool_chunk_size_policy", allocation_CFG_SECTION, CFG_PROFILABLE, CFG_TYPE_STRING, DEFAULT_THIN_POOL_CHUNK_SIZE_POLICY, vsn(2, 2, 101), NULL) -cfg_runtime(allocation_thin_pool_chunk_size_CFG, "thin_pool_chunk_size", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 99), NULL) +cfg(allocation_thin_pool_zero_CFG, "thin_pool_zero", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_ZERO, vsn(2, 2, 99), NULL) +cfg(allocation_thin_pool_discards_CFG, "thin_pool_discards", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_STRING, DEFAULT_THIN_POOL_DISCARDS, vsn(2, 2, 99), NULL) +cfg(allocation_thin_pool_chunk_size_policy_CFG, "thin_pool_chunk_size_policy", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_STRING, DEFAULT_THIN_POOL_CHUNK_SIZE_POLICY, vsn(2, 2, 101), NULL) +cfg_runtime(allocation_thin_pool_chunk_size_CFG, "thin_pool_chunk_size", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 99), NULL) cfg(log_verbose_CFG, "verbose", log_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_VERBOSE, vsn(1, 0, 0), NULL) @@ -204,8 +205,8 @@ cfg(activation_mirror_log_fault_policy_CFG, "mirror_log_fault_policy", activatio cfg_runtime(activation_mirror_image_fault_policy_CFG, "mirror_image_fault_policy", activation_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(2, 2, 57), NULL) cfg(activation_snapshot_autoextend_threshold_CFG, "snapshot_autoextend_threshold", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_SNAPSHOT_AUTOEXTEND_THRESHOLD, vsn(2, 2, 75), NULL) cfg(activation_snapshot_autoextend_percent_CFG, "snapshot_autoextend_percent", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_SNAPSHOT_AUTOEXTEND_PERCENT, vsn(2, 2, 75), NULL) -cfg(activation_thin_pool_autoextend_threshold_CFG, "thin_pool_autoextend_threshold", activation_CFG_SECTION, CFG_PROFILABLE, CFG_TYPE_INT, DEFAULT_THIN_POOL_AUTOEXTEND_THRESHOLD, vsn(2, 2, 89), NULL) -cfg(activation_thin_pool_autoextend_percent_CFG, "thin_pool_autoextend_percent", activation_CFG_SECTION, CFG_PROFILABLE, CFG_TYPE_INT, DEFAULT_THIN_POOL_AUTOEXTEND_PERCENT, vsn(2, 2, 89), NULL) +cfg(activation_thin_pool_autoextend_threshold_CFG, "thin_pool_autoextend_threshold", activation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_INT, DEFAULT_THIN_POOL_AUTOEXTEND_THRESHOLD, vsn(2, 2, 89), NULL) +cfg(activation_thin_pool_autoextend_percent_CFG, "thin_pool_autoextend_percent", activation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_INT, DEFAULT_THIN_POOL_AUTOEXTEND_PERCENT, vsn(2, 2, 89), NULL) cfg_array(activation_mlock_filter_CFG, "mlock_filter", activation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 62), NULL) cfg(activation_use_mlockall_CFG, "use_mlockall", activation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_USE_MLOCKALL, vsn(2, 2, 62), NULL) cfg(activation_monitoring_CFG, "monitoring", activation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_DMEVENTD_MONITOR, vsn(2, 2, 63), NULL)

1 0

master - commands: do not register profile_ARG for lvcreate/lvchange separetely
by Peter Rajnoha 20 May '14

20 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=22cab9c481c853cb… Commit: 22cab9c481c853cb58aef4b5836f74b3ddfd586c Parent: 24f32721a9e6a61943122f3d06d2329f5f81597c Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon May 19 16:29:06 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon May 19 16:30:49 2014 +0200 commands: do not register profile_ARG for lvcreate/lvchange separetely The --profile is globally available for all commands. --- tools/commands.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/commands.h b/tools/commands.h index 21a2075..5a69e44 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -139,10 +139,10 @@ xx(lvchange, ignoreskippedcluster_ARG, major_ARG, minor_ARG, monitor_ARG, minrecoveryrate_ARG, maxrecoveryrate_ARG, noudevsync_ARG, partial_ARG, permission_ARG, persistent_ARG, poll_ARG, - profile_ARG, raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG, - raidsyncaction_ARG, raidwritebehind_ARG, raidwritemostly_ARG, readahead_ARG, - resync_ARG, refresh_ARG, setactivationskip_ARG, syncaction_ARG, sysinit_ARG, - test_ARG, writebehind_ARG, writemostly_ARG, zero_ARG) + raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG, raidsyncaction_ARG, + raidwritebehind_ARG, raidwritemostly_ARG, readahead_ARG, resync_ARG, + refresh_ARG, setactivationskip_ARG, syncaction_ARG, sysinit_ARG, test_ARG, + writebehind_ARG, writemostly_ARG, zero_ARG) xx(lvconvert, "Change logical volume layout", @@ -894,7 +894,7 @@ xx(vgchange, ignoreactivationskip_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG, ignoreskippedcluster_ARG, logicalvolume_ARG, maxphysicalvolumes_ARG, monitor_ARG, noudevsync_ARG, - metadatacopies_ARG, vgmetadatacopies_ARG, partial_ARG, profile_ARG, + metadatacopies_ARG, vgmetadatacopies_ARG, partial_ARG, physicalextentsize_ARG, poll_ARG, refresh_ARG, resizeable_ARG, resizable_ARG, sysinit_ARG, test_ARG, uuid_ARG)

1 0

master - dumpconfig: fix dumpconfig --type diff used in lvm shell as second and later command
by Peter Rajnoha 19 May '14

19 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=24f32721a9e6a619… Commit: 24f32721a9e6a61943122f3d06d2329f5f81597c Parent: 9a324df3b329f1a28462f246219522da62a022ce Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon May 19 14:51:11 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon May 19 15:41:25 2014 +0200 dumpconfig: fix dumpconfig --type diff used in lvm shell as second and later command The dumpconfig reuses existing config_def_check results in case the check is done during general lvm command context initialization (when enabled by config/checks=1) so dumpconfig does not need to run the same check again during its execution, hence saving some time. However, we don't check for differences from defaults during general lvm command initialization as it's useless at that time. It makes sense only in case when such a check is directly requested (like in the case of lvm dumpconfig --type diff). We need to take care that the reused information was already produced with this "diff" checking before and if not, we need to force the check so the check status also gathers the new "diff" info now. Also, do not do diff checking for any other dumpconfig command that is run after dumpconfig --type diff. --- WHATS_NEW | 1 + tools/dumpconfig.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 06d0854..6cbd622 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Fix dumpconfig --type diff when run as second and later cmd in lvm shell. Fix wrong profile reuse from previous run if another cmd is run in lvm shell. Move cache description from lvm(8) to lvmcache(7) man page. Display skipped prompt in silent mode. diff --git a/tools/dumpconfig.c b/tools/dumpconfig.c index 49a6a68..141a030 100644 --- a/tools/dumpconfig.c +++ b/tools/dumpconfig.c @@ -41,10 +41,14 @@ static int _do_def_check(struct config_def_tree_spec *spec, handle->force_check = 1; handle->suppress_messages = 1; - if (spec->type == CFG_DEF_TREE_DIFF) + if (spec->type == CFG_DEF_TREE_DIFF) { + if (!handle->check_diff) + handle->skip_if_checked = 0; handle->check_diff = 1; - else + } else { handle->skip_if_checked = 1; + handle->check_diff = 0; + } config_def_check(handle); *cft_check_handle = handle;

1 0

master - config: fix incorrect profile initialization on cmd context refresh
by Peter Rajnoha 19 May '14

19 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9a324df3b329f1a2… Commit: 9a324df3b329f1a28462f246219522da62a022ce Parent: c42f72867a653974f07e6e1db52f41691356e5b7 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon May 19 13:59:23 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon May 19 15:39:55 2014 +0200 config: fix incorrect profile initialization on cmd context refresh When cmd refresh is called, we need to move any already loaded profiles to profiles_to_load list which will cause their reload on subsequent use. In addition to that, we need to take into account any change in config/profile configuration setting on cmd context refresh since this setting could be overriden with --config. Also, when running commands in the shell, we need to remove the global profile used from the configuration cascade so the profile is not incorrectly reused next time when the --profile option is not specified anymore for the next command in the shell. This bug only affected profile specified by --profile cmd line arg, not profiles referenced from LVM metadata. --- WHATS_NEW | 1 + lib/commands/toolcontext.c | 50 ++++++++++++++++++++++++++++++++++--------- lib/config/config.h | 2 +- tools/lvmcmdline.c | 18 +++++++++------ 4 files changed, 52 insertions(+), 19 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 72834a8..06d0854 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Fix wrong profile reuse from previous run if another cmd is run in lvm shell. Move cache description from lvm(8) to lvmcache(7) man page. Display skipped prompt in silent mode. Make reporting commands show help about possible sort keys on '-O help'. diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 03b06d2..904ae83 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -630,8 +630,9 @@ static int _init_profiles(struct cmd_context *cmd) { const char *dir; struct profile_params *pp; + int initialized = cmd->profile_params != NULL; - if (!(pp = dm_pool_zalloc(cmd->libmem, sizeof(*pp)))) { + if (!initialized && !(pp = dm_pool_zalloc(cmd->libmem, sizeof(*pp)))) { log_error("profile_params alloc failed"); return 0; } @@ -639,11 +640,15 @@ static int _init_profiles(struct cmd_context *cmd) if (!(dir = find_config_tree_str(cmd, config_profile_dir_CFG, NULL))) return_0; - pp->dir = dm_pool_strdup(cmd->libmem, dir); - dm_list_init(&pp->profiles_to_load); - dm_list_init(&pp->profiles); + if (initialized) { + dm_strncpy(cmd->profile_params->dir, dir, sizeof(pp->dir)); + } else { + dm_strncpy(pp->dir, dir, sizeof(pp->dir)); + dm_list_init(&pp->profiles_to_load); + dm_list_init(&pp->profiles); + cmd->profile_params = pp; + } - cmd->profile_params = pp; return 1; } @@ -693,7 +698,7 @@ static void _destroy_config(struct cmd_context *cmd) { struct config_tree_list *cfl; struct dm_config_tree *cft; - struct profile *profile; + struct profile *profile, *tmp_profile; /* * Configuration cascade: @@ -713,12 +718,17 @@ static void _destroy_config(struct cmd_context *cmd) /* CONFIG_PROFILE */ if (cmd->profile_params) { remove_config_tree_by_source(cmd, CONFIG_PROFILE); - dm_list_iterate_items(profile, &cmd->profile_params->profiles_to_load) - config_destroy(profile->cft); - dm_list_iterate_items(profile, &cmd->profile_params->profiles) + /* + * Destroy config trees for any loaded profiles and + * move these profiles to profile_to_load list. + * Whenever these profiles are referenced later, + * they will get loaded again automatically. + */ + dm_list_iterate_items_safe(profile, tmp_profile, &cmd->profile_params->profiles) { config_destroy(profile->cft); - dm_list_init(&cmd->profile_params->profiles_to_load); - dm_list_init(&cmd->profile_params->profiles); + profile->cft = NULL; + dm_list_move(&cmd->profile_params->profiles_to_load, &profile->list); + } } /* CONFIG_STRING */ @@ -1595,6 +1605,8 @@ int refresh_filters(struct cmd_context *cmd) int refresh_toolcontext(struct cmd_context *cmd) { struct dm_config_tree *cft_cmdline, *cft_tmp; + const char *profile_name; + struct profile *profile; log_verbose("Reloading config files"); @@ -1617,7 +1629,13 @@ int refresh_toolcontext(struct cmd_context *cmd) _destroy_dev_types(cmd); _destroy_tags(cmd); + /* save config string passed on the command line */ cft_cmdline = remove_config_tree_by_source(cmd, CONFIG_STRING); + + /* save the global profile name used */ + profile_name = cmd->profile_params->global_profile ? + cmd->profile_params->global_profile->name : NULL; + _destroy_config(cmd); cmd->config_initialized = 0; @@ -1634,6 +1652,13 @@ int refresh_toolcontext(struct cmd_context *cmd) if (cft_cmdline) cmd->cft = dm_config_insert_cascaded_tree(cft_cmdline, cft_tmp); + /* Reload the global profile. */ + if (profile_name) { + if (!(profile = add_profile(cmd, profile_name)) || + !override_config_tree_from_profile(cmd, profile)) + return_0; + } + /* Uses cmd->cft i.e. cft_cmdline + lvm.conf */ _init_logging(cmd); @@ -1657,6 +1682,9 @@ int refresh_toolcontext(struct cmd_context *cmd) if (!_process_config(cmd)) return_0; + if (!_init_profiles(cmd)) + return_0; + if (!(cmd->dev_types = create_dev_types(cmd->proc_dir, find_config_tree_node(cmd, devices_types_CFG, NULL)))) return_0; diff --git a/lib/config/config.h b/lib/config/config.h index 4967b27..df5841c 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -41,7 +41,7 @@ struct profile { }; struct profile_params { - const char *dir; /* subdir in LVM_SYSTEM_DIR where LVM looks for profiles */ + char dir[PATH_MAX]; /* subdir in LVM_SYSTEM_DIR where LVM looks for profiles */ struct profile *global_profile; /* profile that overrides any other VG/LV-based profile ('--profile' cmd line arg) */ struct dm_list profiles_to_load;/* list of profiles which are only added, but still need to be loaded for any use */ struct dm_list profiles; /* list of profiles which are loaded already and which are ready for use */ diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 7e4d9a6..69e5781 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1081,11 +1081,11 @@ static const char *_copy_command_line(struct cmd_context *cmd, int argc, char ** int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) { + struct dm_config_tree *config_string_cft, *config_profile_cft; + struct profile *profile; int ret = 0; int locking_type; int monitoring; - struct dm_config_tree *old_cft; - struct profile *profile; init_error_message_produced(0); @@ -1124,9 +1124,8 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) if (arg_count(cmd, config_ARG) || !cmd->config_initialized || config_files_changed(cmd)) { /* Reinitialise various settings inc. logging, filters */ if (!refresh_toolcontext(cmd)) { - old_cft = remove_config_tree_by_source(cmd, CONFIG_STRING); - if (old_cft) - dm_config_destroy(old_cft); + if ((config_string_cft = remove_config_tree_by_source(cmd, CONFIG_STRING))) + dm_config_destroy(config_string_cft); log_error("Updated config file invalid. Aborting."); return ECMD_FAILED; } @@ -1204,8 +1203,13 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) lvmcache_destroy(cmd, 1, 0); } - if ((old_cft = remove_config_tree_by_source(cmd, CONFIG_STRING))) { - dm_config_destroy(old_cft); + if ((config_string_cft = remove_config_tree_by_source(cmd, CONFIG_STRING))) + dm_config_destroy(config_string_cft); + + config_profile_cft = remove_config_tree_by_source(cmd, CONFIG_PROFILE); + cmd->profile_params->global_profile = NULL; + + if (config_string_cft || config_profile_cft) { /* Move this? */ if (!refresh_toolcontext(cmd)) stack;

1 0

master - config: attach cft_check_handle to each config tree instead of global cmd_context
by Peter Rajnoha 19 May '14

19 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c42f72867a653974… Commit: c42f72867a653974f07e6e1db52f41691356e5b7 Parent: ff9d27a1c71785abd6aa71eddc7018dd56807517 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon May 19 13:23:12 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon May 19 15:38:04 2014 +0200 config: attach cft_check_handle to each config tree instead of global cmd_context Before, the cft_check_handle used to direct configuration checking was part of cmd_context. It's better to attach this as part of the exact config tree against which the check is done. This patch moves the cft_check_handle out of cmd_context and it attaches it to the config tree directly as dm_config_tree->custom->config_source->check_handle. This change makes it easier to track the config tree check results and provides less space for bugs as the results are directly attached to the tree and we don't need to be cautious whether the global value is correct or not (and whether it needs reinitialization) as it was in the case when the cft_check_handle was part of cmd_context. --- lib/commands/toolcontext.c | 34 +++++++++++++++++----------- lib/commands/toolcontext.h | 1 - lib/config/config.c | 51 +++++++++++++++++++++++++++++++++++++++++- lib/config/config.h | 5 +++- tools/dumpconfig.c | 52 +++++++++++++------------------------------ 5 files changed, 90 insertions(+), 53 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index b2f8293..03b06d2 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -256,24 +256,32 @@ static int _check_disable_udev(const char *msg) { return 0; } +static int _check_config_by_source(struct cmd_context *cmd, config_source_t source) +{ + struct dm_config_tree *cft; + struct cft_check_handle *handle; + + if (!(cft = get_config_tree_by_source(cmd, source)) || + !(handle = get_config_tree_check_handle(cmd, cft))) + return 1; + + return config_def_check(handle); +} + static int _check_config(struct cmd_context *cmd) { + int abort_on_error; + if (!find_config_tree_bool(cmd, config_checks_CFG, NULL)) return 1; - if (!cmd->cft_check_handle) { - if (!(cmd->cft_check_handle = dm_pool_zalloc(cmd->libmem, sizeof(*cmd->cft_check_handle)))) { - log_error("Configuration check handle allocation failed."); - return 0; - } - } - - cmd->cft_check_handle->cft = cmd->cft; - cmd->cft_check_handle->cmd = cmd; + abort_on_error = find_config_tree_bool(cmd, config_abort_on_errors_CFG, NULL); - if (!config_def_check(cmd->cft_check_handle) && - find_config_tree_bool(cmd, config_abort_on_errors_CFG, NULL)) { - log_error("LVM configuration invalid."); + if ((!_check_config_by_source(cmd, CONFIG_STRING) || + !_check_config_by_source(cmd, CONFIG_MERGED_FILES) || + !_check_config_by_source(cmd, CONFIG_FILE)) && + abort_on_error) { + log_error("LVM_ configuration invalid."); return 0; } @@ -571,7 +579,7 @@ static int _load_config_file(struct cmd_context *cmd, const char *tag) return 0; } - if (!(cfl->cft = config_file_open_and_read(config_file, CONFIG_FILE))) + if (!(cfl->cft = config_file_open_and_read(config_file, CONFIG_FILE, cmd))) return_0; dm_list_add(&cmd->config_files, &cfl->list); diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index 7694ee2..9023a6c 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -105,7 +105,6 @@ struct cmd_context { int config_initialized; /* used to reinitialize config if previous init was not successful */ struct dm_hash_table *cft_def_hash; /* config definition hash used for validity check (item type + item recognized) */ - struct cft_check_handle *cft_check_handle; /* selected settings with original default/configured value which can be changed during cmd processing */ struct config_info default_settings; diff --git a/lib/config/config.c b/lib/config/config.c index b0880a6..4b5c18c 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -57,6 +57,7 @@ struct config_source { struct config_file *file; struct config_file *profile; } source; + struct cft_check_handle *check_handle; }; /* @@ -246,7 +247,8 @@ void config_destroy(struct dm_config_tree *cft) } struct dm_config_tree *config_file_open_and_read(const char *config_file, - config_source_t source) + config_source_t source, + struct cmd_context *cmd) { struct dm_config_tree *cft; struct stat info; @@ -277,6 +279,22 @@ bad: return NULL; } +struct dm_config_tree *get_config_tree_by_source(struct cmd_context *cmd, + config_source_t source) +{ + struct dm_config_tree *cft = cmd->cft; + struct config_source *cs; + + while (cft) { + cs = dm_config_get_custom(cft); + if (cs && cs->type == source) + return cft; + cft = cft->cascade; + } + + return NULL; +} + /* * Returns config tree if it was removed. */ @@ -305,6 +323,35 @@ struct dm_config_tree *remove_config_tree_by_source(struct cmd_context *cmd, return cft; } +struct cft_check_handle *get_config_tree_check_handle(struct cmd_context *cmd, + struct dm_config_tree *cft) +{ + struct config_source *cs = dm_config_get_custom(cft); + + if (!(cs = dm_config_get_custom(cft))) + return NULL; + + if (cs->check_handle) + goto out; + + /* + * Attach config check handle to all config types but + * CONFIG_FILE_SPECIAL - this one uses its own check + * methods and the cft_check_handle is not applicable here. + */ + if (cs->type != CONFIG_FILE_SPECIAL) { + if (!(cs->check_handle = dm_pool_zalloc(cft->mem, sizeof(*cs->check_handle)))) { + log_error("Failed to allocate configuration check handle."); + return NULL; + } + cs->check_handle->cft = cft; + cs->check_handle->cmd = cmd; + } +out: + return cs->check_handle; +} + + int override_config_tree_from_string(struct cmd_context *cmd, const char *config_settings) { @@ -1646,7 +1693,7 @@ int load_profile(struct cmd_context *cmd, struct profile *profile) { return 0; } - if (!(profile->cft = config_file_open_and_read(profile_path, CONFIG_PROFILE))) + if (!(profile->cft = config_file_open_and_read(profile_path, CONFIG_PROFILE, cmd))) return 0; dm_list_move(&cmd->profile_params->profiles, &profile->list); diff --git a/lib/config/config.h b/lib/config/config.h index d78ea43..4967b27 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -183,7 +183,9 @@ int config_def_check(struct cft_check_handle *handle); int override_config_tree_from_string(struct cmd_context *cmd, const char *config_settings); int override_config_tree_from_profile(struct cmd_context *cmd, struct profile *profile); +struct dm_config_tree *get_config_tree_by_source(struct cmd_context *, config_source_t source); struct dm_config_tree *remove_config_tree_by_source(struct cmd_context *cmd, config_source_t source); +struct cft_check_handle *get_config_tree_check_handle(struct cmd_context *cmd, struct dm_config_tree *cft); config_source_t config_get_source_type(struct dm_config_tree *cft); typedef uint32_t (*checksum_fn_t) (uint32_t initial, const uint8_t *buf, uint32_t size); @@ -193,7 +195,8 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, off_t offset, size_t size, off_t offset2, size_t size2, checksum_fn_t checksum_fn, uint32_t checksum); int config_file_read(struct dm_config_tree *cft); -struct dm_config_tree *config_file_open_and_read(const char *config_file, config_source_t source); +struct dm_config_tree *config_file_open_and_read(const char *config_file, config_source_t source, + struct cmd_context *cmd); int config_write(struct dm_config_tree *cft, struct config_def_tree_spec *tree_spec, const char *file, int argc, char **argv); struct dm_config_tree *config_def_create_tree(struct config_def_tree_spec *spec); diff --git a/tools/dumpconfig.c b/tools/dumpconfig.c index 97863be..49a6a68 100644 --- a/tools/dumpconfig.c +++ b/tools/dumpconfig.c @@ -29,40 +29,13 @@ static int _get_vsn(struct cmd_context *cmd, uint16_t *version_int) return 1; } -static struct cft_check_handle *_get_cft_check_handle(struct cmd_context *cmd, struct dm_config_tree *cft) -{ - struct cft_check_handle *handle; - struct dm_pool *mem; - - if (cft == cmd->cft) { - mem = cmd->libmem; - handle = cmd->cft_check_handle; - } else { - mem = cft->mem; - handle = NULL; - } - - if (!handle) { - if (!(handle = dm_pool_zalloc(mem, sizeof(struct cft_check_handle)))) { - log_error("Configuration check handle allocation failed."); - return NULL; - } - handle->cmd = cmd; - handle->cft = cft; - if (cft == cmd->cft) - cmd->cft_check_handle = handle; - } - - return handle; -} - static int _do_def_check(struct config_def_tree_spec *spec, struct dm_config_tree *cft, struct cft_check_handle **cft_check_handle) { struct cft_check_handle *handle; - if (!(handle = _get_cft_check_handle(spec->cmd, cft))) + if (!(handle = get_config_tree_check_handle(spec->cmd, cft))) return 0; handle->force_check = 1; @@ -94,6 +67,20 @@ static int _merge_config_cascade(struct cmd_context *cmd, struct dm_config_tree return merge_config_tree(cmd, *cft_merged, cft_cascaded, CONFIG_MERGE_TYPE_RAW); } +static int _config_validate(struct cmd_context *cmd, struct dm_config_tree *cft) +{ + struct cft_check_handle *handle; + + if (!(handle = get_config_tree_check_handle(cmd, cft))) + return 1; + + handle->force_check = 1; + handle->skip_if_checked = 1; + handle->suppress_messages = 0; + + return config_def_check(handle); +} + int dumpconfig(struct cmd_context *cmd, int argc, char **argv) { const char *file = arg_str_value(cmd, file_ARG, NULL); @@ -154,14 +141,7 @@ int dumpconfig(struct cmd_context *cmd, int argc, char **argv) cft = cmd->cft; if (arg_count(cmd, validate_ARG)) { - if (!(cft_check_handle = _get_cft_check_handle(cmd, cft))) - return ECMD_FAILED; - - cft_check_handle->force_check = 1; - cft_check_handle->skip_if_checked = 1; - cft_check_handle->suppress_messages = 0; - - if (config_def_check(cft_check_handle)) { + if (_config_validate(cmd, cft)) { log_print("LVM configuration valid."); goto out; } else {

1 0

master - config: add CONFIG_FILE_SPECIAL config source id
by Peter Rajnoha 19 May '14

19 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ff9d27a1c71785ab… Commit: ff9d27a1c71785abd6aa71eddc7018dd56807517 Parent: ecccb759048c143a4e9e2e1b96afb6b6178a9325 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon May 19 10:58:28 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon May 19 15:37:41 2014 +0200 config: add CONFIG_FILE_SPECIAL config source id Add CONFIG_FILE_SPECIAL config source id to make a difference between real configuration tree (like lvm.conf and tag configs) and special purpose configuration tree (like LVM metadata, persistent filter). This makes it easier to attach correct customized data to the config tree that is created out of the source then. --- lib/config/config.c | 29 ++++++++++++++++++++--------- lib/config/config.h | 3 ++- lib/filters/filter-persistent.c | 2 +- lib/format_text/import.c | 4 ++-- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/config/config.c b/lib/config/config.c index 04f917d..b0880a6 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -38,7 +38,8 @@ static const char *_config_source_names[] = { [CONFIG_FILE] = "file", [CONFIG_MERGED_FILES] = "merged files", [CONFIG_STRING] = "string", - [CONFIG_PROFILE] = "profile" + [CONFIG_PROFILE] = "profile", + [CONFIG_FILE_SPECIAL] = "special purpose" }; struct config_file { @@ -100,7 +101,9 @@ struct dm_config_tree *config_open(config_source_t source, goto fail; } - if ((source == CONFIG_FILE) || (source == CONFIG_PROFILE)) { + if ((source == CONFIG_FILE) || + (source == CONFIG_FILE_SPECIAL) || + (source == CONFIG_PROFILE)) { if (!(cf = dm_pool_zalloc(cft->mem, sizeof(struct config_file)))) { log_error("Failed to allocate config file."); goto fail; @@ -133,9 +136,12 @@ int config_file_check(struct dm_config_tree *cft, const char **filename, struct struct config_file *cf; struct stat _info; - if ((cs->type != CONFIG_FILE) && (cs->type != CONFIG_PROFILE)) { - log_error(INTERNAL_ERROR "config_file_check: expected file or profile config source, " - "found %s config source.", _config_source_names[cs->type]); + if ((cs->type != CONFIG_FILE) && + (cs->type != CONFIG_PROFILE) && + (cs->type != CONFIG_FILE_SPECIAL)) { + log_error(INTERNAL_ERROR "config_file_check: expected file, special file or " + "profile config source, found %s config source.", + _config_source_names[cs->type]); return 0; } @@ -227,7 +233,9 @@ void config_destroy(struct dm_config_tree *cft) cs = dm_config_get_custom(cft); - if ((cs->type == CONFIG_FILE) || (cs->type == CONFIG_PROFILE)) { + if ((cs->type == CONFIG_FILE) || + (cs->type == CONFIG_PROFILE) || + (cs->type == CONFIG_FILE_SPECIAL)) { cf = cs->source.file; if (cf && cf->dev) if (!dev_close(cf->dev)) @@ -377,9 +385,12 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, char *buf = NULL; struct config_source *cs = dm_config_get_custom(cft); - if ((cs->type != CONFIG_FILE) && (cs->type != CONFIG_PROFILE)) { - log_error(INTERNAL_ERROR "config_file_read_fd: expected file or profile config source, " - "found %s config source.", _config_source_names[cs->type]); + if ((cs->type != CONFIG_FILE) && + (cs->type != CONFIG_PROFILE) && + (cs->type != CONFIG_FILE_SPECIAL)) { + log_error(INTERNAL_ERROR "config_file_read_fd: expected file, special file " + "or profile config source, found %s config source.", + _config_source_names[cs->type]); return 0; } diff --git a/lib/config/config.h b/lib/config/config.h index b258d55..d78ea43 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -30,7 +30,8 @@ typedef enum { CONFIG_FILE, /* one file config */ CONFIG_MERGED_FILES, /* config that is a result of merging more config files */ CONFIG_STRING, /* config string typed on cmdline using '--config' arg */ - CONFIG_PROFILE /* profile config */ + CONFIG_PROFILE, /* profile config */ + CONFIG_FILE_SPECIAL /* special purpose file config (e.g. metadata, persistent filter...) */ } config_source_t; struct profile { diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index 14a3480..7eaae71 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -114,7 +114,7 @@ int persistent_filter_load(struct dev_filter *f, struct dm_config_tree **cft_out return_0; } - if (!(cft = config_open(CONFIG_FILE, pf->file, 1))) + if (!(cft = config_open(CONFIG_FILE_SPECIAL, pf->file, 1))) return_0; if (!config_file_read(cft)) diff --git a/lib/format_text/import.c b/lib/format_text/import.c index 6b7d589..1b1f332 100644 --- a/lib/format_text/import.c +++ b/lib/format_text/import.c @@ -46,7 +46,7 @@ const char *text_vgname_import(const struct format_type *fmt, _init_text_import(); - if (!(cft = config_open(CONFIG_FILE, NULL, 0))) + if (!(cft = config_open(CONFIG_FILE_SPECIAL, NULL, 0))) return_NULL; if ((!dev && !config_file_read(cft)) || @@ -92,7 +92,7 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, *desc = NULL; *when = 0; - if (!(cft = config_open(CONFIG_FILE, file, 0))) + if (!(cft = config_open(CONFIG_FILE_SPECIAL, file, 0))) return_NULL; if ((!dev && !config_file_read(cft)) ||

1 0

master - tests: drop nosync
by Zdenek Kabelac 19 May '14

19 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ecccb759048c143a… Commit: ecccb759048c143a4e9e2e1b96afb6b6178a9325 Parent: 477351fc4d2f2d0a55089fb6b6bc1f26e2605f7b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 19 13:22:46 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 19 13:22:46 2014 +0200 tests: drop nosync Mirrors currently do not support any conversion, when they are created no-sync. --- test/shell/lvconvert-mirror-basic.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-mirror-basic.sh b/test/shell/lvconvert-mirror-basic.sh index 49d32aa..28258b2 100644 --- a/test/shell/lvconvert-mirror-basic.sh +++ b/test/shell/lvconvert-mirror-basic.sh @@ -77,7 +77,7 @@ test_lvconvert() { fi lvcreate -aey -l2 --type mirror -m $start_count --mirrorlog $start_log_type \ - --nosync -n $lv1 $vg $alloc + -n $lv1 $vg $alloc check mirror_legs $vg $lv1 $start_count_p1 # FIXME: check mirror log else

1 0

master - man: lvmcache
by Zdenek Kabelac 18 May '14

18 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=477351fc4d2f2d0a… Commit: 477351fc4d2f2d0a55089fb6b6bc1f26e2605f7b Parent: 91284bd9b913f74a0071082d542c3c09d11524f2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun May 18 20:09:47 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Sun May 18 20:09:47 2014 +0200 man: lvmcache separate man page for lvm cache --- man/lvmcache.7.in | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 201 insertions(+), 0 deletions(-) diff --git a/man/lvmcache.7.in b/man/lvmcache.7.in new file mode 100644 index 0000000..5a09257 --- /dev/null +++ b/man/lvmcache.7.in @@ -0,0 +1,201 @@ +.TH "LVMCACHE" "7" "LVM TOOLS #VERSION#" "Red Hat, Inc" "\"" +.SH NAME +lvmcache - LVM caching + +.SH DESCRIPTION + +The \fIcache\fP logical volume type uses a small and fast LV to improve +the performance of a large and slow LV. It does this by storing the +frequently used blocks on the faster LV. +LVM refers to the small fast LV as a \fBcache pool LV\fP. The large +slow LV is called the \fBorigin LV\fP. Due to requirements from dm-cache +(the kernel driver), LVM further splits the cache pool LV into two +devices - the \fBcache data LV\fP and \fBcache metadata LV\fP. The cache +data LV is where copies of data blocks are kept from the +origin LV to increase speed. The cache metadata LV holds the +accounting information that specifies where data blocks are stored (e.g. +on the origin LV or on the cache data LV). Users should be familiar with +these LVs if they wish to create the best and most robust cached +logical volumes. + +.SS Cache Terms +.nf +origin LV OriginLV large slow LV +cache data LV CacheDataLV small fast LV for cache pool data +cache metadata LV CacheMetaLV small fast LV for cache pool metadata +cache pool LV CachePoolLV CacheDataLV + CacheMetaLV +cache LV CacheLV OriginLV + CachePoolLV +.fi + +.SS Cache Steps +The steps to create a logical volume of \fIcache\fP type are as follows: +.TP +0. +Create an LV or identify an existing LV to be the origin LV. +.TP +1. +Create the cache data LV. The size of this LV is the size of the cache +and will be reported as the size of the cache pool LV. +.TP +2. +Create the cache metadata LV. +The size of this LV should be 1000 times smaller than the cache data LV +with a minimum size of 8MiB. +.TP +3. +Create the cache pool LV by combining the cache data LV (from step 1) +and cache metadata LV (from step 2). When performing this step, +behavioral characteristics of the cache pool LV can be set. +The name of the cache pool LV takes the name of the cache data LV and +the cache data LV and cache metadata LV are renamed +to CachePoolLV_cdata and CachePoolLV_cmeta. +.TP +4. +Create a cache LV by linking the cache pool LV to the origin LV. +The user accessible cache LV takes the name of the origin LV, +while the origin LV becomes a hidden LV with the name +OriginLV_corig. Users can perform this step while the origin LV +is in use. + +.P +The steps above represent the best way to create a cache LV. +They provide the most options and have the ability to create the +most robust logical volumes. The examples below illustrate how these +steps might be used in practice. + +.SS Cache Commands +.nf +0. create OriginLV +lvcreate -L LargeSize -n OriginLV VG SlowPVs + +1. create CacheDataLV +lvcreate -L CacheSize -n CacheDataLV VG FastPVs + +2. create CacheMetaLV +lvcreate -L MetaSize -n CacheMetaLV VG FastPVs + +3. create CachePoolLV +lvconvert --type cache-pool --poolmetadata VG/CacheMetaLV VG/CacheDataLV +CachePoolLV takes the name of CacheDataLV. +CacheDataLV is renamed CachePoolLV_cdata and becomes hidden. +CacheMetaLV is renamed CachePoolLV_cmeta and becomes hidden. + +4. create CacheLV +lvconvert --type cache --cachepool VG/CachePoolLV VG/OriginLV +CacheLV takes the name of OriginLV. +OriginLV is renamed OriginLV_corig and becomes hidden. +.fi + +.SS Cache Examples + +.B Example 1: +Creating a simple cache LV. +.br + +.nf +0. Create the origin LV +# lvcreate -L 10G -n lvx vg /dev/slow_dev + +1. Create a cache data LV +# lvcreate -L 1G -n lvx_cache vg /dev/fast_dev + +2. Create a cache metadata LV (~1/1000th size of CacheDataLV or 8MiB) +# lvcreate -L 8M -n lvx_cache_meta vg /dev/fast_dev + +3. Create a cache pool LV, combining cache data LV and cache metadata LV +# lvconvert --type cache-pool --poolmetadata vg/lvx_cache_meta \\ + vg/lvx_cache + +4. Create a cached LV by combining the cache pool LV and origin LV +# lvconvert --type cache --cachepool vg/lvx_cache vg/lvx +.fi + +.B Example 2: +Creating a cache LV with a fault tolerant cache pool LV. + +Users who are concerned about the possibility of failures in their fast devices +that could lead to data loss might consider making their cache pool sub-LVs +redundant. Example 2 illustrates how to do that. Note that only steps +1 & 2 change. + +.nf +0. Create an origin LV we wish to cache +# lvcreate -L 10G -n lvx vg /dev/slow_devs + +1. Create a 2-way RAID1 cache data LV +# lvcreate --type raid1 -m 1 -L 1G -n lvx_cache vg \\ + /dev/fast1 /dev/fast2 + +2. Create a 2-way RAID1 cache metadata LV +# lvcreate --type raid1 -m 1 -L 8M -n lvx_cache_meta vg \\ + /dev/fast1 /dev/fast2 + +3. Create a cache pool LV combining cache data LV and cache metadata LV +# lvconvert --type cache-pool --poolmetadata vg/lvx_cache_meta \\ + vg/lvx_cache + +4. Create a cached LV by combining the cache pool LV and origin LV +# lvconvert --type cache --cachepool vg/lvx_cache vg/lvx +.fi + +.B Example 3: +Creating a simple cache LV with \fIwritethough\fP caching. + +Some users wish to ensure that any data written will be stored both in the +cache pool LV and on the origin LV. The loss of a device associated with +the cache pool LV in this case would not mean the loss of any data. When +combining the cache data LV and the cache metadata LV to form the cache pool +LV, properties of the cache can be specified - in this case, +\fIwritethrough\fP vs. \fIwriteback\fP. Note that only step 3 is affected +in this case. + +.nf +0. Create an origin LV we wish to cache (yours may already exist) +# lvcreate -L 10G -n lvx vg /dev/slow + +1. Create a cache data LV +# lvcreate -L 1G -n lvx_cache vg /dev/fast + +2. Create a cache metadata LV +# lvcreate -L 8M -n lvx_cache_meta vg /dev/fast + +3. Create a cache pool LV specifying cache mode "writethrough" +# lvconvert --type cache-pool --poolmetadata vg/lvx_cache_meta \\ + --cachemode writethrough vg/lvx_cache + +4. Create a cache LV by combining the cache pool LV and origin LV +# lvconvert --type cache --cachepool vg/lvx_cache vg/lvx +.fi + +.SS Removing Cache Logical Volumes +If you wish to remove all logical volumes associated with a cache +LV, you must remove both top-level, user-visible devices. +The cache metadata LV and cache data LV cannot be removed +directly. If only the cache pool LV is specfied for removal, any cached +blocks not yet on the origin LV will be flush, the cache pool LV will be +removed, and the now un-cached origin LV will remain. If the user +specifies a cache LV for removal, then the origin LV is +removed and only the cache pool LV will remain. The cache pool LV can then +be used to create another cache LV with a different origin LV if desired. + +When users intend to remove all logical volumes associated with a +cache LV, it is generally better to start with the origin LV and then +remove the cache pool LV. If the operations are performed in the +reverse order, the user will have to wait for the contents of the +cache pool LV to be flushed before the origin LV is removed. This +could take some time. + +.SH SEE ALSO +.BR lvm.conf (5), +.BR lvchange (8), +.BR lvcreate (8), +.BR lvdisplay (8), +.BR lvextend (8), +.BR lvremove (8), +.BR lvrename (8), +.BR lvresize (8), +.BR lvs (8), +.BR vgchange (8), +.BR vgmerge (8), +.BR vgreduce (8), +.BR vgsplit (8)

1 0

master - cleanup: device extent_size first
by Zdenek Kabelac 18 May '14

18 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=91284bd9b913f74a… Commit: 91284bd9b913f74a0071082d542c3c09d11524f2 Parent: 58777756e8453188d9d0aeb906bb74666e5bbecc Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun May 18 20:08:07 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Sun May 18 20:08:07 2014 +0200 cleanup: device extent_size first --- lib/metadata/lv_manip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 6a24873..0eaa719 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -3560,7 +3560,7 @@ static int _fsadm_cmd(struct cmd_context *cmd, if (fcmd == FSADM_CMD_RESIZE) { if (dm_snprintf(size_buf, SIZE_BUF, "%" PRIu64 "K", - (uint64_t) lp->extents * vg->extent_size / 2) < 0) { + (uint64_t) lp->extents * (vg->extent_size / 2)) < 0) { log_error("Couldn't generate new LV size string"); return 0; }

1 0

master - debug: backtrace error path
by Zdenek Kabelac 18 May '14

18 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=58777756e8453188… Commit: 58777756e8453188d9d0aeb906bb74666e5bbecc Parent: b73a78675576c562b8bf510d16dab8a35bf4cb02 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun May 18 20:07:24 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Sun May 18 20:07:24 2014 +0200 debug: backtrace error path Add backtrace for 'n' answer. --- lib/metadata/lv_manip.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index fa08c39..6a24873 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -3166,9 +3166,10 @@ int lv_extend(struct logical_volume *lv, /* FIXME Support --force */ if (yes_no_prompt("Do full resync of extended " "portion of %s/%s? [y/n]: ", - lv->vg->name, lv->name) == 'y') - goto out; - r = 0; + lv->vg->name, lv->name) == 'n') { + r = 0; + goto_out; + } goto out; }

1 0

master - man: lvmcache
by Zdenek Kabelac 15 May '14

15 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b73a78675576c562… Commit: b73a78675576c562b8bf510d16dab8a35bf4cb02 Parent: 11bedf1baf6dbc48c7abf9a14f8584d996d00a59 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 15 12:06:18 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 15 12:13:24 2014 +0200 man: lvmcache Migrate cache description into man(7) entry (like lvmthin). --- WHATS_NEW | 1 + man/Makefile.in | 11 ++- man/lvm.8.in | 189 +--------------------------------------------------- spec/packages.inc | 1 + 4 files changed, 13 insertions(+), 189 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 5900bc6..72834a8 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Move cache description from lvm(8) to lvmcache(7) man page. Display skipped prompt in silent mode. Make reporting commands show help about possible sort keys on '-O help'. Add metadata_percent to lvs_cols. diff --git a/man/Makefile.in b/man/Makefile.in index c6a27d0..dd59555 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -41,6 +41,7 @@ LVMETAD = endif MAN5=lvm.conf.5 +MAN7= MAN8=lvm-dumpconfig.8 \ lvchange.8 lvconvert.8 lvcreate.8 lvdisplay.8 lvextend.8 lvm.8 \ lvmchange.8 lvmconf.8 lvmdiskscan.8 lvmdump.8 lvmsadc.8 lvmsar.8 \ @@ -61,10 +62,12 @@ ifeq ("@BUILD_CMIRRORD@", "yes") MAN8CLUSTER+=cmirrord.8 endif +ifneq ("@CACHE@", "none") + MAN7+=lvmcache.7 +endif + ifneq ("@THIN@", "none") - MAN7=lvmthin.7 -else - MAN7= + MAN7+=lvmthin.7 endif MAN8DM=dmsetup.8 $(DMEVENTDMAN) @@ -75,7 +78,7 @@ MAN8DIR=$(mandir)/man8 MAN8SYSTEMD_GENERATORS=lvm2-activation-generator.8 CLEAN_TARGETS=$(MAN5) $(MAN7) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN) $(BLKDEACTIVATEMAN) $(DMEVENTDMAN) $(MAN8DM) -DISTCLEAN_TARGETS=fsadm.8 clvmd.8 cmirrord.8 dmeventd.8 lvmthin.7 blkdeactivate.8 +DISTCLEAN_TARGETS=fsadm.8 clvmd.8 cmirrord.8 dmeventd.8 lvmcache.7 lvmthin.7 blkdeactivate.8 include $(top_builddir)/make.tmpl diff --git a/man/lvm.8.in b/man/lvm.8.in index e1063c6..41223b0 100644 --- a/man/lvm.8.in +++ b/man/lvm.8.in @@ -406,191 +406,8 @@ a command. Some logical volume types are simple to create and can be done with a single \fBlvcreate\fP(8) command. The linear and striped logical volume types are an example of this. Other logical volume types may -require more than one command to create. The cache and thin provisioning -types are examples of this. - -.br -.SS Cache -The \fIcache\fP logical volume type uses a small and fast LV to improve -the performance of a large and slow LV. It does this by storing the -frequently used blocks on the faster LV. -LVM refers to the small fast LV as a \fBcache pool LV\fP. The large -slow LV is called the \fBorigin LV\fP. Due to requirements from dm-cache -(the kernel driver), LVM further splits the cache pool LV into two -devices - the \fBcache data LV\fP and \fBcache metadata LV\fP. The cache -data LV is where copies of data blocks are kept from the -origin LV to increase speed. The cache metadata LV holds the -accounting information that specifies where data blocks are stored (e.g. -on the origin LV or on the cache data LV). Users should be familiar with -these LVs if they wish to create the best and most robust cached -logical volumes. - -.SS Cache Terms -.nf -origin LV OriginLV large slow LV -cache data LV CacheDataLV small fast LV for cache pool data -cache metadata LV CacheMetaLV small fast LV for cache pool metadata -cache pool LV CachePoolLV CacheDataLV + CacheMetaLV -cache LV CacheLV OriginLV + CachePoolLV -.fi - -.SS Cache Steps -The steps to create a logical volume of \fIcache\fP type are as follows: -.TP -0. -Create an LV or identify an existing LV to be the origin LV. -.TP -1. -Create the cache data LV. The size of this LV is the size of the cache -and will be reported as the size of the cache pool LV. -.TP -2. -Create the cache metadata LV. -The size of this LV should be 1000 times smaller than the cache data LV -with a minimum size of 8MiB. -.TP -3. -Create the cache pool LV by combining the cache data LV (from step 1) -and cache metadata LV (from step 2). When performing this step, -behavioral characteristics of the cache pool LV can be set. -The name of the cache pool LV takes the name of the cache data LV and -the cache data LV and cache metadata LV are renamed -to CachePoolLV_cdata and CachePoolLV_cmeta. -.TP -4. -Create a cache LV by linking the cache pool LV to the origin LV. -The user accessible cache LV takes the name of the origin LV, -while the origin LV becomes a hidden LV with the name -OriginLV_corig. Users can perform this step while the origin LV -is in use. - -.P -The steps above represent the best way to create a cache LV. -They provide the most options and have the ability to create the -most robust logical volumes. The examples below illustrate how these -steps might be used in practice. - -.SS Cache Commands -.nf -0. create OriginLV -lvcreate -L LargeSize -n OriginLV VG SlowPVs - -1. create CacheDataLV -lvcreate -L CacheSize -n CacheDataLV VG FastPVs - -2. create CacheMetaLV -lvcreate -L MetaSize -n CacheMetaLV VG FastPVs - -3. create CachePoolLV -lvconvert --type cache-pool --poolmetadata VG/CacheMetaLV VG/CacheDataLV -CachePoolLV takes the name of CacheDataLV. -CacheDataLV is renamed CachePoolLV_cdata and becomes hidden. -CacheMetaLV is renamed CachePoolLV_cmeta and becomes hidden. - -4. create CacheLV -lvconvert --type cache --cachepool VG/CachePoolLV VG/OriginLV -CacheLV takes the name of OriginLV. -OriginLV is renamed OriginLV_corig and becomes hidden. -.fi - -.SS Cache Examples - -.B Example 1: -Creating a simple cache LV. -.br - -.nf -0. Create the origin LV -# lvcreate -L 10G -n lvx vg /dev/slow_dev - -1. Create a cache data LV -# lvcreate -L 1G -n lvx_cache vg /dev/fast_dev - -2. Create a cache metadata LV (~1/1000th size of CacheDataLV or 8MiB) -# lvcreate -L 8M -n lvx_cache_meta vg /dev/fast_dev - -3. Create a cache pool LV, combining cache data LV and cache metadata LV -# lvconvert --type cache-pool --poolmetadata vg/lvx_cache_meta \\ - vg/lvx_cache - -4. Create a cached LV by combining the cache pool LV and origin LV -# lvconvert --type cache --cachepool vg/lvx_cache vg/lvx -.fi - -.B Example 2: -Creating a cache LV with a fault tolerant cache pool LV. - -Users who are concerned about the possibility of failures in their fast devices -that could lead to data loss might consider making their cache pool sub-LVs -redundant. Example 2 illustrates how to do that. Note that only steps -1 & 2 change. - -.nf -0. Create an origin LV we wish to cache -# lvcreate -L 10G -n lvx vg /dev/slow_devs - -1. Create a 2-way RAID1 cache data LV -# lvcreate --type raid1 -m 1 -L 1G -n lvx_cache vg \\ - /dev/fast1 /dev/fast2 - -2. Create a 2-way RAID1 cache metadata LV -# lvcreate --type raid1 -m 1 -L 8M -n lvx_cache_meta vg \\ - /dev/fast1 /dev/fast2 - -3. Create a cache pool LV combining cache data LV and cache metadata LV -# lvconvert --type cache-pool --poolmetadata vg/lvx_cache_meta \\ - vg/lvx_cache - -4. Create a cached LV by combining the cache pool LV and origin LV -# lvconvert --type cache --cachepool vg/lvx_cache vg/lvx -.fi - -.B Example 3: -Creating a simple cache LV with \fIwritethough\fP caching. - -Some users wish to ensure that any data written will be stored both in the -cache pool LV and on the origin LV. The loss of a device associated with -the cache pool LV in this case would not mean the loss of any data. When -combining the cache data LV and the cache metadata LV to form the cache pool -LV, properties of the cache can be specified - in this case, -\fIwritethrough\fP vs. \fIwriteback\fP. Note that only step 3 is affected -in this case. - -.nf -0. Create an origin LV we wish to cache (yours may already exist) -# lvcreate -L 10G -n lvx vg /dev/slow - -1. Create a cache data LV -# lvcreate -L 1G -n lvx_cache vg /dev/fast - -2. Create a cache metadata LV -# lvcreate -L 8M -n lvx_cache_meta vg /dev/fast - -3. Create a cache pool LV specifying cache mode "writethrough" -# lvconvert --type cache-pool --poolmetadata vg/lvx_cache_meta \\ - --cachemode writethrough vg/lvx_cache - -4. Create a cache LV by combining the cache pool LV and origin LV -# lvconvert --type cache --cachepool vg/lvx_cache vg/lvx -.fi - -.SS Removing Cache Logical Volumes -If you wish to remove all logical volumes associated with a cache -LV, you must remove both top-level, user-visible devices. -The cache metadata LV and cache data LV cannot be removed -directly. If only the cache pool LV is specfied for removal, any cached -blocks not yet on the origin LV will be flush, the cache pool LV will be -removed, and the now un-cached origin LV will remain. If the user -specifies a cache LV for removal, then the origin LV is -removed and only the cache pool LV will remain. The cache pool LV can then -be used to create another cache LV with a different origin LV if desired. - -When users intend to remove all logical volumes associated with a -cache LV, it is generally better to start with the origin LV and then -remove the cache pool LV. If the operations are performed in the -reverse order, the user will have to wait for the contents of the -cache pool LV to be flushed before the origin LV is removed. This -could take some time. +require more than one command to create. The cache (\fBlvmcache\fP(7)) +and thin provisioning (\fBlvmthin\fP(7)) types are examples of this. .SH DIAGNOSTICS All tools return a status code of zero on success or non-zero on failure. @@ -600,6 +417,8 @@ All tools return a status code of zero on success or non-zero on failure. .I $HOME/.lvm_history .SH SEE ALSO .BR lvm.conf (5), +.BR lvmcache (7), +.BR lvmthin (7), .BR lvm\ dumpconfig (8), .BR clvmd (8), .BR lvchange (8), diff --git a/spec/packages.inc b/spec/packages.inc index 16b90e0..5999ab7 100644 --- a/spec/packages.inc +++ b/spec/packages.inc @@ -83,6 +83,7 @@ fi %{_sbindir}/lvmetad %endif %{_mandir}/man5/lvm.conf.5.gz +%{_mandir}/man7/lvmcache.7.gz %{_mandir}/man7/lvmthin.7.gz %{_mandir}/man8/fsadm.8.gz %{_mandir}/man8/lvchange.8.gz

1 0

master - display: print skipped prompt
by Zdenek Kabelac 15 May '14

15 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=11bedf1baf6dbc48… Commit: 11bedf1baf6dbc48c7abf9a14f8584d996d00a59 Parent: 76c06c72523201bdb478bd1735b2fcfbe49d3d38 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 15 11:58:49 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 15 12:11:35 2014 +0200 display: print skipped prompt Since decisions in the silent mode may not be always obvious, print skipped prompt with answer 'n'. Also document '-qq' behaviour (single -q only shuts logging, while -qq sets silent mode). --- WHATS_NEW | 1 + lib/display/display.c | 10 ++++++---- man/lvm.8.in | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 090e914..5900bc6 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Display skipped prompt in silent mode. Make reporting commands show help about possible sort keys on '-O help'. Add metadata_percent to lvs_cols. Take account of parity areas with alloc anywhere in _calc_required_extents. diff --git a/lib/display/display.c b/lib/display/display.c index b808f25..3c47aa8 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -880,9 +880,6 @@ char yes_no_prompt(const char *prompt, ...) int c = 0, ret = 0; va_list ap; - if (silent_mode()) - return 'n'; - sigint_allow(); do { if (c == '\n' || !c) { @@ -890,6 +887,11 @@ char yes_no_prompt(const char *prompt, ...) vfprintf(stderr, prompt, ap); va_end(ap); fflush(stderr); + if (silent_mode()) { + fputc('n', stderr); + ret = 'n'; + break; + } ret = 0; } @@ -911,7 +913,7 @@ char yes_no_prompt(const char *prompt, ...) sigint_restore(); if (c != '\n') - fprintf(stderr, "\n"); + fputc('\n', stderr); return ret; } diff --git a/man/lvm.8.in b/man/lvm.8.in index e273935..e1063c6 100644 --- a/man/lvm.8.in +++ b/man/lvm.8.in @@ -174,6 +174,7 @@ Overrides config file setting. .BR \-q ", " \-\-quiet Suppress output and log messages. Overrides \fB\-d\fP and \fB\-v\fP. +Repeat once to also suppress any prompts with answer 'no'. .TP .BR \-\-yes Don't prompt for confirmation interactively but instead always assume the

1 0

master - tests: speedup
by Zdenek Kabelac 15 May '14

15 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=76c06c72523201bd… Commit: 76c06c72523201bdb478bd1735b2fcfbe49d3d38 Parent: 309201a53bcbbd4967f380214e688c520b957fdf Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 15 10:25:25 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 15 12:08:35 2014 +0200 tests: speedup Avoid some expencive raid/mirror synchronization when testing just allocation sizes. Use lv_attr_bit --- test/shell/lvchange-raid.sh | 62 ++++++++++++++-------------- test/shell/lvconvert-mirror-basic.sh | 2 +- test/shell/lvcreate-pvtags.sh | 4 +- test/shell/lvcreate-raid.sh | 74 +++++++++++++++------------------ test/shell/lvcreate-raid10.sh | 16 +++----- test/shell/snapshots-of-mirrors.sh | 4 +- test/shell/vgsplit-operation.sh | 6 +- 7 files changed, 79 insertions(+), 89 deletions(-) diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh index afa2431..8ef6c33 100644 --- a/test/shell/lvchange-raid.sh +++ b/test/shell/lvchange-raid.sh @@ -37,8 +37,8 @@ run_writemostly_check() { $vg $lv $segtype # No writemostly flag should be there yet. - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*-.$' - get lv_field $vg/${lv}_rimage_1 lv_attr -a | grep '.*-.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "-" + check lv_attr_bit health $vg/${lv}_rimage_1 "-" if [ "$segtype" != "raid1" ]; then not lvchange --writemostly $d0 $vg/$lv @@ -47,71 +47,71 @@ run_writemostly_check() { # Set the flag lvchange --writemostly $d0 $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "w" # Running again should leave it set (not toggle) lvchange --writemostly $d0 $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "w" # Running again with ':y' should leave it set lvchange --writemostly $d0:y $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "w" # ':n' should unset it lvchange --writemostly $d0:n $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*-.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "-" # ':n' again should leave it unset lvchange --writemostly $d0:n $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*-.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "-" # ':t' toggle to set lvchange --writemostly $d0:t $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "w" # ':t' toggle to unset lvchange --writemostly $d0:t $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*-.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "-" # ':y' to set lvchange --writemostly $d0:y $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "w" # Toggle both at once lvchange --writemostly $d0:t --writemostly $d1:t $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*-.$' - get lv_field $vg/${lv}_rimage_1 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "-" + check lv_attr_bit health $vg/${lv}_rimage_1 "w" # Toggle both at once again lvchange --writemostly $d0:t --writemostly $d1:t $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' - get lv_field $vg/${lv}_rimage_1 lv_attr -a | grep '.*-.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "w" + check lv_attr_bit health $vg/${lv}_rimage_1 "-" # Toggle one, unset the other lvchange --writemostly $d0:n --writemostly $d1:t $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*-.$' - get lv_field $vg/${lv}_rimage_1 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "-" + check lv_attr_bit health $vg/${lv}_rimage_1 "w" # Toggle one, set the other lvchange --writemostly $d0:y --writemostly $d1:t $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' - get lv_field $vg/${lv}_rimage_1 lv_attr -a | grep '.*-.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "w" + check lv_attr_bit health $vg/${lv}_rimage_1 "-" # Partial flag supercedes writemostly flag aux disable_dev $d0 - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*p.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "p" # It is possible for the kernel to detect the failed device before # we re-enable it. If so, the field will be set to 'r'efresh since # that also takes precedence over 'w'ritemostly. If this has happened, # we refresh the LV and then check for 'w'. aux enable_dev $d0 - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*r.$' && lvchange --refresh $vg/$lv - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*w.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "r" && lvchange --refresh $vg/$lv + check lv_attr_bit health $vg/${lv}_rimage_0 "w" # Catch Bad writebehind values - not lvchange --writebehind "invalid" $vg/$lv - not lvchange --writebehind -256 $vg/$lv + invalid lvchange --writebehind "invalid" $vg/$lv + invalid lvchange --writebehind -256 $vg/$lv # Set writebehind check lv_field $vg/$lv raid_write_behind "" @@ -122,8 +122,8 @@ run_writemostly_check() { lvconvert -m 0 $vg/$lv $d1 lvconvert --type raid1 -m 1 $vg/$lv $d1 check lv_field $vg/$lv raid_write_behind "" - get lv_field $vg/${lv}_rimage_0 lv_attr -a | grep '.*-.$' - get lv_field $vg/${lv}_rimage_1 lv_attr -a | grep '.*-.$' + check lv_attr_bit health $vg/${lv}_rimage_0 "-" + check lv_attr_bit health $vg/${lv}_rimage_1 "-" } # run_syncaction_check <VG> <LV> @@ -152,7 +152,7 @@ run_syncaction_check() { seek=$(($seek + $size)) # Jump halfway through the RAID image - get lv_field $vg/$lv lv_attr | grep '.*-.$' + check lv_attr_bit health $vg/$lv "-" check lv_field $vg/$lv raid_mismatch_count "0" # Overwrite the last half of one of the PVs with crap @@ -192,7 +192,7 @@ run_syncaction_check() { # 'lvs' should show results lvchange --syncaction check $vg/$lv aux wait_for_sync $vg $lv - get lv_field $vg/$lv lv_attr | grep '.*-.$' + check lv_attr_bit health $vg/$lv "-" check lv_field $vg/$lv raid_mismatch_count "0" } @@ -220,7 +220,7 @@ run_refresh_check() { sync # Check for 'p'artial flag - get lv_field $vg/$lv lv_attr | grep '.*p.$' + check lv_attr_bit health $vg/$lv "p" dmsetup status lvs -a -o name,attr,devices $vg @@ -230,18 +230,18 @@ run_refresh_check() { lvs -a -o name,attr,devices $vg # Check for 'r'efresh flag - get lv_field $vg/$lv lv_attr | grep '.*r.$' + check lv_attr_bit health $vg/$lv "r" lvchange --refresh $vg/$lv aux wait_for_sync $vg $lv - get lv_field $vg/$lv lv_attr | grep '.*-.$' + check lv_attr_bit health $vg/$lv "-" # Writing random data above should mean that the devices # were out-of-sync. The refresh should have taken care # of properly reintegrating the device. lvchange --syncaction repair $vg/$lv aux wait_for_sync $vg $lv - get lv_field $vg/$lv lv_attr | grep '.*-.$' + check lv_attr_bit health $vg/$lv "-" } # run_recovery_rate_check <VG> <LV> diff --git a/test/shell/lvconvert-mirror-basic.sh b/test/shell/lvconvert-mirror-basic.sh index 28258b2..49d32aa 100644 --- a/test/shell/lvconvert-mirror-basic.sh +++ b/test/shell/lvconvert-mirror-basic.sh @@ -77,7 +77,7 @@ test_lvconvert() { fi lvcreate -aey -l2 --type mirror -m $start_count --mirrorlog $start_log_type \ - -n $lv1 $vg $alloc + --nosync -n $lv1 $vg $alloc check mirror_legs $vg $lv1 $start_count_p1 # FIXME: check mirror log else diff --git a/test/shell/lvcreate-pvtags.sh b/test/shell/lvcreate-pvtags.sh index 340a4f4..1df07fc 100644 --- a/test/shell/lvcreate-pvtags.sh +++ b/test/shell/lvcreate-pvtags.sh @@ -31,10 +31,10 @@ not lvcreate -l4 -i4 $vg @fast not lvcreate -l2 -i2 $vg "$DM_DEV_DIR/mapper/pv1" # lvcreate mirror -lvcreate -aey -l1 --type mirror -m1 $vg @fast +lvcreate -aey -l1 --type mirror -m1 --nosync $vg @fast # lvcreate mirror w/corelog -lvcreate -aey -l1 --type mirror -m2 --corelog $vg @fast +lvcreate -aey -l1 --type mirror -m2 --corelog --nosync $vg @fast # lvcreate mirror w/no free PVs not lvcreate -aey -l1 --type mirror -m2 $vg @fast diff --git a/test/shell/lvcreate-raid.sh b/test/shell/lvcreate-raid.sh index 15cf09f..d0d365f 100644 --- a/test/shell/lvcreate-raid.sh +++ b/test/shell/lvcreate-raid.sh @@ -12,11 +12,7 @@ . lib/test lv_devices() { - local local_vg=$1 - local local_lv=$2 - local count=$3 - - [ $count == `lvs --noheadings -o devices $local_vg/$local_lv | sed s/,/' '/g | wc -w` ] + test $3 -eq $(get lv_devices $1/$2 | wc -w) } ######################################################## @@ -47,10 +43,10 @@ lvremove -ff $vg # Create RAID1 (explicit 3-way) - Set min/max recovery rate lvcreate --type raid1 -m 2 -l 2 \ - --minrecoveryrate 50 --maxrecoveryrate 100 \ + --minrecoveryrate 50 --maxrecoveryrate 1M \ -n $lv1 $vg check lv_field $vg/$lv1 raid_min_recovery_rate 50 -check lv_field $vg/$lv1 raid_max_recovery_rate 100 +check lv_field $vg/$lv1 raid_max_recovery_rate 1024 aux wait_for_sync $vg $lv1 lvremove -ff $vg @@ -70,10 +66,10 @@ for i in raid4 \ raid6 raid6_zr raid6_nr raid6_nc; do lvcreate --type $i -l 3 -i 3 \ - --minrecoveryrate 50 --maxrecoveryrate 100 \ + --minrecoveryrate 50 --maxrecoveryrate 1M \ -n $lv1 $vg check lv_field $vg/$lv1 raid_min_recovery_rate 50 - check lv_field $vg/$lv1 raid_max_recovery_rate 100 + check lv_field $vg/$lv1 raid_max_recovery_rate 1024 aux wait_for_sync $vg $lv1 lvremove -ff $vg done @@ -83,86 +79,84 @@ done # 6 PVs with 18.5m in each PV. # 1 metadata LV = 1 extent = .5m # 1 image = 36+37+37 extents = 55.00m = lv_size -lvcreate --type raid1 -m 1 -l 100%FREE -n raid1 $vg +lvcreate --type raid1 -m 1 -l 100%FREE -an -Zn -n raid1 $vg check lv_field $vg/raid1 size "55.00m" lvremove -ff $vg # 1 metadata LV = 1 extent # 1 image = 36 extents # 5 images = 180 extents = 90.00m = lv_size -lvcreate --type raid5 -i 5 -l 100%FREE -n raid5 $vg +lvcreate --type raid5 -i 5 -l 100%FREE -an -Zn -n raid5 $vg should check lv_field $vg/raid5 size "90.00m" #FIXME: Currently allocates incorrectly at 87.50m lvremove -ff $vg # 1 image = 36+37 extents # 2 images = 146 extents = 73.00m = lv_size -lvcreate --type raid5 -i 2 -l 100%FREE -n raid5 $vg +lvcreate --type raid5 -i 2 -l 100%FREE -an -Zn -n raid5 $vg check lv_field $vg/raid5 size "73.00m" lvremove -ff $vg # 1 image = 36 extents # 4 images = 144 extents = 72.00m = lv_size -lvcreate --type raid6 -i 4 -l 100%FREE -n raid6 $vg +lvcreate --type raid6 -i 4 -l 100%FREE -an -Zn -n raid6 $vg should check lv_field $vg/raid6 size "72.00m" #FIXME: Currnently allocates incorrectly at 70.00m lvremove -ff $vg -# Eat 18 of 37 extents from dev1, leaving 19 -lvcreate -l 18 -n lv $vg "$dev1" +### +# For following tests eat 18 of 37 extents from dev1, leaving 19 +lvcreate -l 18 -an -Zn -n eat_space $vg "$dev1" +EAT_SIZE=$(get lv_field $vg/eat_space size) + # Using 100% free should take the rest of dev1 and equal from dev2 # 1 meta takes 1 extent # 1 image = 18 extents = 9.00m = lv_size -lvcreate --type raid1 -m 1 -l 100%FREE -n raid1 $vg "$dev1" "$dev2" +lvcreate --type raid1 -m 1 -l 100%FREE -an -Zn -n raid1 $vg "$dev1" "$dev2" check lv_field $vg/raid1 size "9.00m" # Ensure image size is the same as the RAID1 size check lv_field $vg/raid1 size $(get lv_field $vg/raid1_rimage_0 size -a) # Amount remaining in dev2 should equal the amount taken by 'lv' in dev1 -check pv_field "$dev2" pv_free $(get lv_field $vg/lv size) -lvremove -ff $vg +check pv_field "$dev2" pv_free "$EAT_SIZE" +lvremove -ff $vg/raid1 -# Eat 18 of 37 extents from dev1, leaving 19 -lvcreate -l 18 -n lv $vg "$dev1" # Using 100% free should take the rest of dev1 and equal amount from the rest # 1 meta takes 1 extent # 1 image = 18 extents = 9.00m # 5 images = 90 extents = 45.00m = lv_size -lvcreate --type raid5 -i 5 -l 100%FREE -n raid5 $vg +lvcreate --type raid5 -i 5 -l 100%FREE -an -Zn -n raid5 $vg check lv_field $vg/raid5 size "45.00m" # Amount remaining in dev6 should equal the amount taken by 'lv' in dev1 -check pv_field "$dev6" pv_free `lvs --noheadings -o size $vg/lv` -lvremove -ff $vg +check pv_field "$dev6" pv_free "$EAT_SIZE" +lvremove -ff $vg/raid5 -# Eat 18 of 37 extents from dev1, leaving 19 -lvcreate -l 18 -n lv $vg "$dev1" # Using 100% free should take the rest of dev1, an equal amount # from 2 more devs, and all extents from 3 additional devs # 1 meta takes 1 extent # 1 image = 18+37 extents # 2 images = 110 extents = 55.00m = lv_size -lvcreate --type raid5 -i 2 -l 100%FREE -n raid5 $vg +lvcreate --type raid5 -i 2 -l 100%FREE -an -Zn -n raid5 $vg check lv_field $vg/raid5 size "55.00m" -lvremove -ff $vg +lvremove -ff $vg/raid5 # Let's do some stripe tests too -# Eat 18 of 37 extents from dev1, leaving 19 -lvcreate -l 18 -n lv $vg "$dev1" # Using 100% free should take the rest of dev1 and an equal amount from rest # 1 image = 19 extents # 6 images = 114 extents = 57.00m = lv_size -lvcreate -i 6 -l 100%FREE -n stripe $vg +lvcreate -i 6 -l 100%FREE -an -Zn -n stripe $vg check lv_field $vg/stripe size "57.00m" -lvremove -ff $vg +lvremove -ff $vg/stripe -# Eat 18 of 37 extents from dev1, leaving 19 -lvcreate -l 18 -n lv $vg "$dev1" # Using 100% free should take the rest of dev1, an equal amount from # one more dev, and all of the remaining 4 # 1 image = 19+37+37 extents # 2 images = 186 extents = 93.00m = lv_size -lvcreate -i 2 -l 100%FREE -n stripe $vg +lvcreate -i 2 -l 100%FREE -an -Zn -n stripe $vg check lv_field $vg/stripe size "93.00m" + lvremove -ff $vg +# end of use of '$vg/eat_space' +### # Create RAID (implicit stripe count based on PV count) ####################################################### @@ -173,20 +167,20 @@ not lvcreate --type raid5 -l2 $vg "$dev1" "$dev2" not lvcreate --type raid6 -l3 $vg "$dev1" "$dev2" "$dev3" "$dev4" # Implicit count comes from #PVs given (always 2 for mirror though) -lvcreate --type raid1 -l1 -n raid1 $vg "$dev1" "$dev2" +lvcreate --type raid1 -l1 -an -Zn -n raid1 $vg "$dev1" "$dev2" lv_devices $vg raid1 2 -lvcreate --type raid5 -l2 -n raid5 $vg "$dev1" "$dev2" "$dev3" +lvcreate --type raid5 -l2 -an -Zn -n raid5 $vg "$dev1" "$dev2" "$dev3" lv_devices $vg raid5 3 -lvcreate --type raid6 -l3 -n raid6 $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" +lvcreate --type raid6 -l3 -an -Zn -n raid6 $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" lv_devices $vg raid6 5 lvremove -ff $vg # Implicit count comes from total #PVs in VG (always 2 for mirror though) -lvcreate --type raid1 -l1 -n raid1 $vg +lvcreate --type raid1 -l1 -an -Zn -n raid1 $vg lv_devices $vg raid1 2 -lvcreate --type raid5 -l2 -n raid5 $vg +lvcreate --type raid5 -l2 -an -Zn -n raid5 $vg lv_devices $vg raid5 6 -lvcreate --type raid6 -l3 -n raid6 $vg +lvcreate --type raid6 -l3 -an -Zn -n raid6 $vg lv_devices $vg raid6 6 vgremove -ff $vg diff --git a/test/shell/lvcreate-raid10.sh b/test/shell/lvcreate-raid10.sh index 7ce8100..a521794 100644 --- a/test/shell/lvcreate-raid10.sh +++ b/test/shell/lvcreate-raid10.sh @@ -12,11 +12,7 @@ . lib/test lv_devices() { - local local_vg=$1 - local local_lv=$2 - local count=$3 - - [ $count == `lvs --noheadings -o devices $local_vg/$local_lv | sed s/,/' '/g | wc -w` ] + test $3 -eq $(get lv_devices $1/$2 | wc -w) } ######################################################## @@ -41,10 +37,10 @@ lvremove -ff $vg/$lv1 # 2-way mirror, 2-stripes - Set min/max recovery rate lvcreate --type raid10 -m 1 -i 2 -l 2 \ - --minrecoveryrate 50 --maxrecoveryrate 100 \ + --minrecoveryrate 50 --maxrecoveryrate 1M \ -n $lv1 $vg check lv_field $vg/$lv1 raid_min_recovery_rate 50 -check lv_field $vg/$lv1 raid_max_recovery_rate 100 +check lv_field $vg/$lv1 raid_max_recovery_rate 1024 aux wait_for_sync $vg $lv1 # 2-way mirror, 3-stripes @@ -57,7 +53,7 @@ lvremove -ff $vg # 37 extents / device # 1 image = 36 extents (1 for meta) # 3 images = 108 extents = 54.00m -lvcreate --type raid10 -i 3 -l 100%FREE -n raid10 $vg +lvcreate --type raid10 -i 3 -l 100%FREE -an -Zn -n raid10 $vg check lv_field $vg/raid10 size "54.00m" lvremove -ff $vg @@ -68,12 +64,12 @@ lvremove -ff $vg not lvcreate --type raid10 -l2 $vg "$dev1" "$dev2" "$dev3" # Implicit count comes from #PVs given (always 2-way mirror) -lvcreate --type raid10 -l2 -n raid10 $vg "$dev1" "$dev2" "$dev3" "$dev4" +lvcreate --type raid10 -l2 -an -Zn -n raid10 $vg "$dev1" "$dev2" "$dev3" "$dev4" lv_devices $vg raid10 4 lvremove -ff $vg # Implicit count comes from total #PVs in VG (always 2 for mirror though) -lvcreate --type raid10 -l2 -n raid10 $vg +lvcreate --type raid10 -l2 -an -Zn -n raid10 $vg lv_devices $vg raid10 6 lvremove -ff $vg diff --git a/test/shell/snapshots-of-mirrors.sh b/test/shell/snapshots-of-mirrors.sh index cfb0792..ac5cf85 100644 --- a/test/shell/snapshots-of-mirrors.sh +++ b/test/shell/snapshots-of-mirrors.sh @@ -13,9 +13,9 @@ aux prepare_vg 4 -# Attempt to create snapshot of a mirror origin - should fail -lvcreate -aey --type mirror -m 1 -L 10M -n lv $vg +lvcreate -aey --type mirror -m 1 -L 10M --nosync -n lv $vg +# Create snapshot of a mirror origin lvcreate -s $vg/lv -L 10M -n snap # Down-convert (mirror -> linear) under a snapshot diff --git a/test/shell/vgsplit-operation.sh b/test/shell/vgsplit-operation.sh index 201ad17..4291dd4 100644 --- a/test/shell/vgsplit-operation.sh +++ b/test/shell/vgsplit-operation.sh @@ -278,7 +278,7 @@ vgremove -ff $vg1 COMM "vgsplit fails splitting 1 mirror + 1 striped LV, only striped LV specified" create_vg_ $vg1 "$dev1" "$dev2" "$dev3" "$dev4" -lvcreate -an -Zn -l 16 -n $lv1 --type mirror -m1 $vg1 "$dev1" "$dev2" "$dev3" +lvcreate -an -Zn -l 16 -n $lv1 --type mirror --nosync -m1 $vg1 "$dev1" "$dev2" "$dev3" lvcreate -an -Zn -l 16 -n $lv2 -i 2 $vg1 "$dev3" "$dev4" check pvlv_counts $vg1 4 2 0 not vgsplit -n $lv2 $vg1 $vg2 2>err @@ -289,7 +289,7 @@ vgremove -f $vg1 # COMM "vgsplit fails, active mirror involved in split" create_vg_ $vg1 "$dev1" "$dev2" "$dev3" "$dev4" -lvcreate -aey -l 16 -n $lv1 --type mirror -m1 $vg1 "$dev1" "$dev2" "$dev3" +lvcreate -aey -l 16 -n $lv1 --type mirror --nosync -m1 $vg1 "$dev1" "$dev2" "$dev3" lvcreate -l 16 -n $lv2 $vg1 "$dev4" lvchange -an $vg1/$lv2 check pvlv_counts $vg1 4 2 0 @@ -299,7 +299,7 @@ vgremove -f $vg1 COMM "vgsplit succeeds, active mirror not involved in split" create_vg_ $vg1 "$dev1" "$dev2" "$dev3" "$dev4" -lvcreate -aey -l 16 -n $lv1 --type mirror -m1 $vg1 "$dev1" "$dev2" "$dev3" +lvcreate -aey -l 16 -n $lv1 --type mirror --nosync -m1 $vg1 "$dev1" "$dev2" "$dev3" lvcreate -l 16 -n $lv2 $vg1 "$dev4" lvchange -an $vg1/$lv2 check pvlv_counts $vg1 4 2 0

1 0

master - man:misc updates
by Zdenek Kabelac 15 May '14

15 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=309201a53bcbbd49… Commit: 309201a53bcbbd4967f380214e688c520b957fdf Parent: 7c86131233011c9fb81190bcb40d5d4ac54a533d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu May 15 10:25:15 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu May 15 12:08:35 2014 +0200 man:misc updates --- man/lvchange.8.in | 6 +++++- man/lvconvert.8.in | 35 ++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/man/lvchange.8.in b/man/lvchange.8.in index 5de75e0..b138c3d 100644 --- a/man/lvchange.8.in +++ b/man/lvchange.8.in @@ -181,7 +181,7 @@ the number of I/Os to the drive to a minimum. The default behavior is to set the write-mostly attribute for the specified physical volume in the logical volume. It is possible to also remove the write-mostly flag by appending a ":n" to the physical volume or to toggle the value by specifying -":t". The \fI--writemostly\fP argument can be specified more than one time +":t". The \fB--writemostly\fP argument can be specified more than one time in a single command; making it possible to toggle the write-mostly attributes for all the physical volumes in a logical volume at once. .TP @@ -237,6 +237,10 @@ manually without a clustered lock manager. Set zeroing mode for thin pool. Note: already provisioned blocks from pool in non-zero mode are not cleared in unwritten parts when setting zero to \fIy\fP. +.SH ENVIRONMENT VARIABLES +.TP +.B LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES +Suppress locking failure messages. .SH Examples Changes the permission on volume lvol1 in volume group vg00 to be read-only: .sp diff --git a/man/lvconvert.8.in b/man/lvconvert.8.in index fe6525b..8c3479f 100644 --- a/man/lvconvert.8.in +++ b/man/lvconvert.8.in @@ -162,15 +162,17 @@ Exactly one of .BR \-\-replace , .BR \-\-splitsnapshot , .BR \-\-snapshot , -.BR \-\-splitmirrors -or +.BR \-\-splitmirrors , +.BR \-\-thin , .BR \-\-thinpool +or +.BR \-\-type arguments is required. .TP .BR \-b ", " \-\-background Run the daemon in the background. .TP -.BR \-\-cachepool " " \fCachePoolLV +.BR \-\-cachepool " " \fICachePoolLV This argument is necessary when converting a logical volume to a cache LV. For more information on cache pool LVs and cache LVs, see \fBlvm\fP(8). .TP @@ -204,9 +206,15 @@ A mirror is divided into regions of this size (in MB), and the mirror log uses this granularity to track which regions are in sync. .TP .B \-\-type \fISegmentType -Used to convert a logical volume to another segment type, like cache-pool, -cache, raid1, or thin-pool. When converting a logical volume to a cache LV, -the \-\-cachepool argument is required. +Used to convert a logical volume to another segment type, like +.IR cache-pool , +.IR cache , +.IR raid1 , +or +.IR thin-pool . +When converting a logical volume to a cache LV, the +.B \-\-cachepool +argument is required. .TP .BR \-i ", " \-\-interval " " \fISeconds Report progress as a percentage at regular intervals. @@ -246,8 +254,9 @@ The inverse of \-\-snapshot. .TP .B \-s, \-\-snapshot Recreates a snapshot from constituent logical volumes (or copies of them) after -having been separated using \-\-splitsnapshot. For this to work correctly, no -changes may be made to the contents of either volume after the split. +having been separated using \fB\-\-splitsnapshot\fP. +For this to work correctly, no changes may be made to the contents +of either volume after the split. .TP .BR \-c ", " \-\-chunksize " " \fIChunkSize [ \fIbBsSkKmMgG ] Gives the size of chunk for snapshot and thin pool logical volumes. @@ -328,9 +337,9 @@ Default unit is megabytes. .TP .IR \fB\-r ", " \fB\-\-readahead " {" ReadAheadSectors | auto | none } Sets read ahead sector count of thin pool metadata logical volume. -The default value is "auto" which allows the kernel to choose +The default value is "\fIauto\fP" which allows the kernel to choose a suitable value automatically. -"None" is equivalent to specifying zero. +"\fINone\fP" is equivalent to specifying zero. .TP .B \-\-repair Repair a mirror after suffering a disk failure or try to fix thin pool metadata. @@ -380,9 +389,9 @@ The volume cannot be further modified as long as it is used as an external origin volume for unprovisioned areas of any thin logical volume. .TP .IR \fB\-\-thinpool " " ThinPoolLogicalVolume { Name | Path } -Changes logical volume into a thin pool volume. The volume -will store the pool's data. -Thin pool metadata logical volume can be specified with the option +Switches logical volume into a thin pool's data volume. +Content of converted volume is lost. +Thin pool's metadata logical volume can be specified with the option \fB\-\-poolmetadata\fP or allocated with \fB\-\-poolmetadatasize\fP. .SH Examples

1 0

master - report: export DM_REPORT_FIELD_RESERVED_NAME_{HELP, HELP_ALT} and show help on '<lvm_command> -O help'
by Peter Rajnoha 15 May '14

15 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7c86131233011c9f… Commit: 7c86131233011c9fb81190bcb40d5d4ac54a533d Parent: 5684cfcb1c13129b70ddaf1ee4df95e08bc551a9 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu May 15 10:58:05 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu May 15 10:58:14 2014 +0200 report: export DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} and show help on '<lvm_command> -O help' Share DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} between libdm and any libdm user to handle reserved field names, in this case the virtual field name to show help instead of failing on unrecognized field. The libdm user also needs to check the field name so it can fire proper code in this case (cleanup, exit etc.). --- WHATS_NEW | 1 + WHATS_NEW_DM | 2 ++ libdm/libdevmapper.h | 4 ++++ libdm/libdm-report.c | 11 ++++++++--- tools/reporter.c | 5 ++++- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index c5cbf37..090e914 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Make reporting commands show help about possible sort keys on '-O help'. Add metadata_percent to lvs_cols. Take account of parity areas with alloc anywhere in _calc_required_extents. Use proper uint64 casting for calculation of cache metadata size. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index c81d354..6304ff6 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,7 @@ Version 1.02.88 - ================================= + Also recognize 'help'/'?' as reserved sort key name to show help. + Export recognized DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} to show help. Add dm_units_to_factor for size unit parsing. Increase bitset size for minors for thin dmeventd plugin. diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 8ffa145..d63b135 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1601,6 +1601,10 @@ struct dm_report_field; #define DM_REPORT_FIELD_TYPE_ID_LEN 32 #define DM_REPORT_FIELD_TYPE_HEADING_LEN 32 +/* Reserved field names for special purposes. */ +#define DM_REPORT_FIELD_RESERVED_NAME_HELP "help" /* shows help */ +#define DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT "?" /* shows help */ + struct dm_report; struct dm_report_field_type { uint32_t type; /* object type id */ diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 7e8484e..f3395a7 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -529,7 +529,8 @@ static int _parse_fields(struct dm_report *rh, const char *format, if (!_field_match(rh, ws, (size_t) (we - ws), report_type_only)) { _display_fields(rh); log_warn(" "); - if (strcasecmp(ws, "help") && strcmp(ws, "?")) + if (strcasecmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP) && + strcmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT)) log_error("Unrecognised field: %.*s", (int) (we - ws), ws); return 0; @@ -556,8 +557,12 @@ static int _parse_keys(struct dm_report *rh, const char *keys, while (*we && *we != ',') we++; if (!_key_match(rh, ws, (size_t) (we - ws), report_type_only)) { - log_error("dm_report: Unrecognised field: %.*s", - (int) (we - ws), ws); + _display_fields(rh); + log_warn(" "); + if (strcasecmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP) && + strcmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT)) + log_error("dm_report: Unrecognised field: %.*s", + (int) (we - ws), ws); return 0; } } diff --git a/tools/reporter.c b/tools/reporter.c index 2591fd5..b4a0c0b 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -370,7 +370,10 @@ static int _report(struct cmd_context *cmd, int argc, char **argv, separator, aligned, buffered, headings, field_prefixes, quoted, columns_as_rows))) { - if (!strcasecmp(options, "help") || !strcmp(options, "?")) + if ( (!strcasecmp(options, DM_REPORT_FIELD_RESERVED_NAME_HELP) || + !strcmp(options, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT)) || + (!strcasecmp(keys, DM_REPORT_FIELD_RESERVED_NAME_HELP) || + !strcmp(keys, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT)) ) return r; return_ECMD_FAILED; }

1 0

master - report: Add metadata_percent to lvs_cols.
by Alasdair Kergon 15 May '14

15 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5684cfcb1c13129b… Commit: 5684cfcb1c13129b70ddaf1ee4df95e08bc551a9 Parent: 42d7409da2761198781e067b81a4dca86ba27ee9 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu May 15 08:32:27 2014 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu May 15 08:32:27 2014 +0100 report: Add metadata_percent to lvs_cols. --- WHATS_NEW | 1 + conf/example.conf.in | 2 +- lib/config/defaults.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 8bcf687..c5cbf37 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Add metadata_percent to lvs_cols. Take account of parity areas with alloc anywhere in _calc_required_extents. Use proper uint64 casting for calculation of cache metadata size. Better support for nesting of blocking signals. diff --git a/conf/example.conf.in b/conf/example.conf.in index bc1758d..935d3e7 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -1040,7 +1040,7 @@ activation { # Comma separated list of columns to report for 'lvs' command. # See 'lvs -o help' for the list of possible fields. - # lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,move_pv,mirror_log,copy_percent,convert_lv" + # lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,metadata_percent,move_pv,mirror_log,copy_percent,convert_lv" # Comma separated list of columns to report for 'lvs' command in verbose mode. # See 'lvs -o help' for the list of possible fields. diff --git a/lib/config/defaults.h b/lib/config/defaults.h index 137b4c8..4200dc8 100644 --- a/lib/config/defaults.h +++ b/lib/config/defaults.h @@ -180,7 +180,7 @@ #define DEFAULT_REP_QUOTED 1 #define DEFAULT_REP_SEPARATOR " " -#define DEFAULT_LVS_COLS "lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,move_pv,mirror_log,copy_percent,convert_lv" +#define DEFAULT_LVS_COLS "lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,metadata_percent,move_pv,mirror_log,copy_percent,convert_lv" #define DEFAULT_VGS_COLS "vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free" #define DEFAULT_PVS_COLS "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free" #define DEFAULT_SEGS_COLS "lv_name,vg_name,lv_attr,stripes,segtype,seg_size"

1 0

master - man: lvmthin cover snapshot merge and xfs
by David Teigland 14 May '14

14 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=42d7409da2761198… Commit: 42d7409da2761198781e067b81a4dca86ba27ee9 Parent: 044b7968005a23e52a78c26eb56a7f74a973312f Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed May 14 14:05:21 2014 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed May 14 15:15:35 2014 -0500 man: lvmthin cover snapshot merge and xfs also fix a couple inconsistent example values. --- man/lvmthin.7.in | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 3 deletions(-) diff --git a/man/lvmthin.7.in b/man/lvmthin.7.in index 5a4ee87..030745b 100644 --- a/man/lvmthin.7.in +++ b/man/lvmthin.7.in @@ -104,7 +104,7 @@ The primary method for using lvm thin provisioning: lvcreate -n ThinDataLV -L LargeSize VG Example - # lvcreate -n pool0 -L 100G vg + # lvcreate -n pool0 -L 10G vg 2. create ThinMetaLV @@ -251,6 +251,10 @@ Single step thin pool LV creation .br Single step thin pool LV and thin LV creation .br +Merge thin snapshots +.br +XFS on snapshots +.br \& @@ -269,7 +273,7 @@ lvcreate -n ThinMetaLV -L SmallSize VG SmallPV lvconvert --thinpool VG/ThinDataLV --poolmetadata VG/ThinMetaLV Example -# lvcreate -n pool0 -L 100G vg /dev/sdA +# lvcreate -n pool0 -L 10G vg /dev/sdA # lvcreate -n pool0meta -L 1G vg /dev/sdB # lvconvert --thinpool vg/pool0 --poolmetadata vg/pool0meta .fi @@ -293,7 +297,7 @@ lvcreate --type raid1 -m 1 -n ThinDataLV -L LargeSize VG PVC PVD lvconvert --thinpool VG/ThinDataLV --poolmetadata VG/ThinMetaLV Example -# lvcreate --type raid1 -m 1 -n pool0 -L 100G vg /dev/sdA /dev/sdB +# lvcreate --type raid1 -m 1 -n pool0 -L 10G vg /dev/sdA /dev/sdB # lvcreate --type raid1 -m 1 -n pool0meta -L 1G vg /dev/sdC /dev/sdD # lvconvert --thinpool vg/pool0 --poolmetadata vg/pool0meta .fi @@ -981,6 +985,111 @@ pool0 vg twi-a-tz-- 8.00m thin1 vg Vwi-a-tz-- 2.00g pool0 .fi + +.SS Merge thin snapshots + +\& + +A thin snapshot can be merged into its origin thin LV using the lvconvert +--merge command. The result of a snapshot merge is that the origin thin +LV takes the content of the snapshot LV, and the snapshot LV is removed. +Any content that was unique to the origin thin LV is lost after the merge. + +Because a merge changes the content of an LV, it cannot be done while the +LVs are open, e.g. mounted. If a merge is initiated while the LVs are open, +the effect of the merge is delayed until the origin thin LV is next +activated. + +.nf +lvconvert --merge VG/SnapLV + +Example +# lvs vg +LV VG Attr LSize Pool Origin +pool0 vg twi-a-tz-- 10.00g +thin1 vg Vwi-a-tz-- 100.00g pool0 +thin1s1 vg Vwi-a-tz-k 100.00g pool0 thin1 + +# lvconvert --merge vg/thin1s1 + +# lvs vg +LV VG Attr LSize Pool Origin +pool0 vg twi-a-tz-- 10.00g +thin1 vg Vwi-a-tz-- 100.00g pool0 +.fi + +.nf +Example + +Delayed merging of open LVs. + +# lvs vg +LV VG Attr LSize Pool Origin +pool0 vg twi-a-tz-- 10.00g +thin1 vg Vwi-aotz-- 100.00g pool0 +thin1s1 vg Vwi-aotz-k 100.00g pool0 thin1 + +# df +/dev/mapper/vg-thin1 100G 33M 100G 1% /mnt/X +/dev/mapper/vg-thin1s1 100G 33M 100G 1% /mnt/Xs + +# ls /mnt/X +file1 file2 file3 +# ls /mnt/Xs +file3 file4 file5 + +# lvconvert --merge vg/thin1s1 +Logical volume vg/thin1s1 contains a filesystem in use. +Delaying merge since snapshot is open. +Merging of thin snapshot thin1s1 will occur on next activation. + +# umount /mnt/X +# umount /mnt/Xs + +# lvs -a vg +LV VG Attr LSize Pool Origin +pool0 vg twi-a-tz-- 10.00g +[pool0_tdata] vg Twi-ao---- 10.00g +[pool0_tmeta] vg ewi-ao---- 1.00g +thin1 vg Owi-a-tz-- 100.00g pool0 +[thin1s1] vg Swi-a-tz-k 100.00g pool0 thin1 + +# lvchange -an vg/thin1 +# lvchange -ay vg/thin1 + +# mount /dev/vg/thin1 /mnt/X + +# ls /mnt/X +file3 file4 file5 +.fi + + +.SS XFS on snapshots + +\& + +Mounting an XFS file system on a new snapshot LV requires attention to the +file system's log state and uuid. On the snapshot LV, the xfs log will +contain a dummy transaction, and the xfs uuid will match the uuid from the +file system on the origin LV. + +If the snapshot LV is writable, mounting will recover the log to clear the +dummy transaction, but will require skipping the uuid check: + +mount /dev/VG/SnapLV /mnt -o nouuid + +Or, the uuid can be changed on disk before mounting: + +xfs_admin -U generate /dev/VG/SnapLV +.br +mount /dev/VG/SnapLV /mnt + +If the snapshot LV is readonly, the log recovery and uuid check need to be +skipped while mounting readonly: + +mount /dev/VG/SnapLV /mnt -o ro,nouuid,norecovery + + .SH SEE ALSO .BR lvm (8), .BR lvm.conf (5),

1 0

master - man: more lvmthin discard references
by David Teigland 14 May '14

14 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=044b7968005a23e5… Commit: 044b7968005a23e52a78c26eb56a7f74a973312f Parent: 3b989e317fecf115ce9a2b89f777e4feec2461ec Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed May 14 09:44:09 2014 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed May 14 15:15:35 2014 -0500 man: more lvmthin discard references and some fixes from Tom. --- man/lvmthin.7.in | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/man/lvmthin.7.in b/man/lvmthin.7.in index 55b1562..5a4ee87 100644 --- a/man/lvmthin.7.in +++ b/man/lvmthin.7.in @@ -23,10 +23,10 @@ that will hold blocks for thin LVs, and a metadata LV that will hold metadata. The metadata tracks which data blocks belong to each thin LV. Snapshots of thin LVs are efficient because the data blocks common to a -thin LV and its snapshot are shared. Snapshots may be taken of thin LVs -or of other thin snapshots. Blocks common to recursive snapshots are also -shared in the thin pool. There is no limit to or degradation from -sequences of snapshots. +thin LV and any of its snapshots are shared. Snapshots may be taken of +thin LVs or of other thin snapshots. Blocks common to recursive snapshots +are also shared in the thin pool. There is no limit to or degradation +from sequences of snapshots. As thin LVs or snapshot LVs are written to, they consume data blocks in the thin pool. As free data blocks in the pool decrease, more free blocks @@ -620,6 +620,9 @@ pool0 vg twi-a-tz-- 10.00g 47.01 21.03 thin1 vg Vwi-aotz-- 100.00g pool0 2.70 .fi +The "Discard" section covers an option for automatically freeing data +space in a thin pool. + .SS Automatically extend thin pool LV @@ -691,7 +694,7 @@ extended. (Disabling dmeventd is not recommended.) writes to thin LVs in the pool. (This can be addressed by tuning the thin_pool_autoextend_threshold and thin_pool_autoextend_percent.) -4. The VG does have enough free blocks to extend the thin pool. +4. The VG does not have enough free blocks to extend the thin pool. The response to data space exhaustion is to extend the thin pool. This is described in the section "Manually manage free data space of thin pool @@ -768,8 +771,10 @@ controls the default zeroing mode used when creating a thin pool. \& -The discard behavior of a thin pool LV determines how discard requests -are handled. Possible discard behaviors: +The discard behavior of a thin pool LV determines how discard requests are +handled. Enabling discard under a file system may adversely affect the +file system performance (see the section on fstrim for an alternative.) +Possible discard behaviors: ignore: Ignore any discards that are received. @@ -933,7 +938,7 @@ and combines the two into a thin pool LV. lvcreate -L LargeSize --thinpool VG/ThinPoolLV Example -# lvcreate -l1 --thinpool vg/pool0 +# lvcreate -L8M --thinpool vg/pool0 # lvs vg/pool0 LV VG Attr LSize Pool Origin Data%

1 0

master - allocation: Fix alloc anywhere with parity.
by Alasdair Kergon 14 May '14

14 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3b989e317fecf115… Commit: 3b989e317fecf115ce9a2b89f777e4feec2461ec Parent: 422b3b0fb53d83bc3ffbd35f7d7505a1938cb24c Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Wed May 14 16:25:43 2014 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Wed May 14 16:25:43 2014 +0100 allocation: Fix alloc anywhere with parity. Take account of parity areas with alloc anywhere in _calc_required_extents. Extents beyond area_count were treated incorrectly as mirror logs. --- WHATS_NEW | 1 + lib/metadata/lv_manip.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 88ae713..8bcf687 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.107 - ================================== + Take account of parity areas with alloc anywhere in _calc_required_extents. Use proper uint64 casting for calculation of cache metadata size. Better support for nesting of blocking signals. Use only sigaction handler and drop duplicate signal handler. diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 2005826..fa08c39 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -1432,8 +1432,7 @@ static int _alloc_parallel_area(struct alloc_handle *ah, uint32_t max_to_allocat struct alloced_area *aa; struct pv_area *pva; - total_area_count = ah->area_count + alloc_state->log_area_count_still_needed; - total_area_count += ah->parity_count; + total_area_count = ah->area_count + ah->parity_count + alloc_state->log_area_count_still_needed; if (!total_area_count) { log_warn(INTERNAL_ERROR "_alloc_parallel_area called without any allocation to do."); return 1; @@ -1980,7 +1979,7 @@ static uint32_t _calc_required_extents(struct alloc_handle *ah, struct pv_area * * reduce amount we're looking for. */ if (alloc == ALLOC_ANYWHERE) { - if (ix_pva >= ah->area_count) + if (ix_pva >= ah->area_count + ah->parity_count) required = ah->log_len; } else if (required < ah->log_len) required = ah->log_len;

1 0

master - man: Fix man7 dir dependency.
by Alasdair Kergon 13 May '14

13 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=422b3b0fb53d83bc… Commit: 422b3b0fb53d83bc3ffbd35f7d7505a1938cb24c Parent: 85cf5a23d265c10af7e69b5f85e06e75105d8f14 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue May 13 11:18:13 2014 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue May 13 11:18:13 2014 +0100 man: Fix man7 dir dependency. https://bugs.gentoo.org/510202 --- man/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/Makefile.in b/man/Makefile.in index af108cf..c6a27d0 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -103,7 +103,7 @@ install_man5: $(MAN5) $(INSTALL) -d $(MAN5DIR) $(INSTALL_DATA) $(MAN5) $(MAN5DIR)/ -install_man7: $(MAN8) +install_man7: $(MAN7) $(INSTALL) -d $(MAN7DIR) $(INSTALL_DATA) $(MAN7) $(MAN7DIR)/

1 0

master - cleanup: improve error message
by Zdenek Kabelac 13 May '14

13 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=85cf5a23d265c10a… Commit: 85cf5a23d265c10af7e69b5f85e06e75105d8f14 Parent: 7b766b064837110a09d448376ea61af174260ae7 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 13 10:33:17 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 13 10:33:17 2014 +0200 cleanup: improve error message Update impossile to happen error message. --- lib/config/config.c | 2 +- lib/metadata/thin_manip.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/config/config.c b/lib/config/config.c index 1a9f636..04f917d 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -1767,7 +1767,7 @@ int get_default_allocation_thin_pool_chunk_size_CFG(struct cmd_context *cmd, str uint32_t chunk_size; if (!(str = find_config_tree_str(cmd, allocation_thin_pool_chunk_size_policy_CFG, profile))) { - log_error(INTERNAL_ERROR "Cannot find profile."); + log_error(INTERNAL_ERROR "Cannot find configuration."); return 0; } diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c index c1c90b4..cccd244 100644 --- a/lib/metadata/thin_manip.c +++ b/lib/metadata/thin_manip.c @@ -376,7 +376,7 @@ int update_profilable_pool_params(struct cmd_context *cmd, struct profile *profi if (!(passed_args & PASS_ARG_CHUNK_SIZE)) { if (!(*chunk_size = find_config_tree_int(cmd, allocation_thin_pool_chunk_size_CFG, profile) * 2)) { if (!(str = find_config_tree_str(cmd, allocation_thin_pool_chunk_size_policy_CFG, profile))) { - log_error(INTERNAL_ERROR "Could not find profile."); + log_error(INTERNAL_ERROR "Could not find configuration."); return 0; } if (!strcasecmp(str, "generic")) @@ -401,7 +401,7 @@ int update_profilable_pool_params(struct cmd_context *cmd, struct profile *profi if (!(passed_args & PASS_ARG_DISCARDS)) { if (!(str = find_config_tree_str(cmd, allocation_thin_pool_discards_CFG, profile))) { - log_error(INTERNAL_ERROR "Could not find profile."); + log_error(INTERNAL_ERROR "Could not find configuration."); return 0; } if (!get_pool_discards(str, discards))

1 0

master - tests: updates
by Zdenek Kabelac 13 May '14

13 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7b766b064837110a… Commit: 7b766b064837110a09d448376ea61af174260ae7 Parent: 6f057e3c6640f25676b0c5d0fe93912ac91244bf Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue May 13 10:28:55 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue May 13 10:28:55 2014 +0200 tests: updates Move thin test out of listing. --- test/shell/listings.sh | 2 +- test/shell/lvcreate-thin.sh | 6 +++--- test/shell/snapshot-maxsize.sh | 5 ++--- test/shell/snapshot-usage.sh | 10 ++++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/test/shell/listings.sh b/test/shell/listings.sh index 79c9c89..2121ecd 100644 --- a/test/shell/listings.sh +++ b/test/shell/listings.sh @@ -65,10 +65,10 @@ lvcreate -aey -l2 --type mirror -m2 -n $lv3 $vg test $(lvs --noheadings $vg | wc -l) -eq 2 test $(lvs -a --noheadings $vg | wc -l) -eq 6 dmsetup ls|grep "$PREFIX"|grep -v "LVMTEST.*pv." + lvcreate -l2 -s $vg/$lv3 lvcreate -l1 -s -n inval $vg/$lv3 lvcreate -l4 -I4 -i2 -n stripe $vg -lvcreate -T $vg/pool -I4 -i2 -l5 -V1P -n thin # Invalidate snapshot not dd if=/dev/zero of="$DM_DEV_DIR/$vg/inval" bs=4K invalid lvscan "$dev1" diff --git a/test/shell/lvcreate-thin.sh b/test/shell/lvcreate-thin.sh index 0873ce1..7ea4fcf 100644 --- a/test/shell/lvcreate-thin.sh +++ b/test/shell/lvcreate-thin.sh @@ -135,7 +135,7 @@ lvremove -ff $vg check vg_field $vg lv_count 0 # Create thin snapshot of thinLV -lvcreate -L10M -V10M -T $vg/pool --name lv1 +lvcreate -L10M -I4 -i2 -V10M -T $vg/pool --name lv1 mkfs.ext4 "$DM_DEV_DIR/$vg/lv1" lvcreate -K -s $vg/lv1 --name snap_lv1 fsck -n "$DM_DEV_DIR/$vg/snap_lv1" @@ -145,8 +145,10 @@ lvcreate --type snapshot $vg/lv1 --name lv6 lvcreate --type snapshot $vg/lv1 --name lv4 lvcreate --type snapshot $vg/lv1 --name $vg/lv5 +lvdisplay --maps $vg check_lv_field_modules_ thin-pool,thin lv1 snap_lv1 lv2 lv3 lv4 lv5 lv6 check vg_field $vg lv_count 8 + lvremove -ff $vg @@ -163,8 +165,6 @@ check vg_field $vg lv_count 6 lvremove -ff $vg check vg_field $vg lv_count 0 -lvdisplay $vg - # Fail cases # Too small pool size (1 extent 64KB) for given chunk size not lvcreate --chunksize 256 -l1 -T $vg/pool1 diff --git a/test/shell/snapshot-maxsize.sh b/test/shell/snapshot-maxsize.sh index a20e306..e1380c6 100644 --- a/test/shell/snapshot-maxsize.sh +++ b/test/shell/snapshot-maxsize.sh @@ -24,8 +24,7 @@ lvcreate -L2 -s $vg/$lv1 -n $lv2 dd if=/dev/zero of="$DM_DEV_DIR/$vg/$lv2" bs=1M count=1 -get lv_field $vg/$lv2 lv_attr | tee attrs -# Snapshot must not be invalid here -grep -v "....I" attrs +# Snapshot must not be 'I'nvalid here +check lv_attr_bit state $vg/$lv2 "a" vgremove -f $vg diff --git a/test/shell/snapshot-usage.sh b/test/shell/snapshot-usage.sh index 095fddb..589ed43 100644 --- a/test/shell/snapshot-usage.sh +++ b/test/shell/snapshot-usage.sh @@ -145,6 +145,7 @@ lvextend -l+33 $vg1/lvol1 check lv_field $vg1/lvol1 size "$EXPECT3" fill 20K + lvremove -f $vg1 # Check snapshot really deletes COW header for read-only snapshot @@ -172,11 +173,12 @@ fsck -n "$DM_DEV_DIR/$vg1/snap" # we have 2 valid results (unsure about correct version number) check lv_field $vg1/snap data_percent "$EXPECT4" -# Can't test >= 16T devices on 32bit -if test "$TSIZE" = 15P ; then - vgremove -ff $vg1 + +# Can't test >= 16T devices on 32bit +test "$TSIZE" = 15P || exit 0 + # Check usability with largest extent size pvcreate "$DM_DEV_DIR/$vg/$lv" vgcreate -s 4G $vg1 "$DM_DEV_DIR/$vg/$lv" @@ -189,4 +191,4 @@ lvremove -ff $vg1 lvcreate -V15E -l1 -n $lv1 -s $vg1 check lv_field $vg1/$lv1 origin_size "15.00e" -fi +vgremove -ff $vg1

1 0

master - tests: replance hostname call
by Zdenek Kabelac 12 May '14

12 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6f057e3c6640f256… Commit: 6f057e3c6640f25676b0c5d0fe93912ac91244bf Parent: c07fb7678ecb7ecf54e9acc4c2f3ef6138cec90f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 12 10:39:57 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 12 16:24:40 2014 +0200 tests: replance hostname call --- test/shell/lvchange-thin.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/lvchange-thin.sh b/test/shell/lvchange-thin.sh index 0b4c15d..c6fd813 100644 --- a/test/shell/lvchange-thin.sh +++ b/test/shell/lvchange-thin.sh @@ -98,7 +98,7 @@ not lvchange --resync --addtag foo $vg/$lv1 # # Play with tags and activation # -TAG=$(hostname) +TAG=$(uname -n) aux lvmconf 'activation/volume_list = [ "$vg/$lv2", "@mytag", "$vg2" ]' lvchange -ay $vg/$lv1

1 0

master - cleanup: drop unused header
by Zdenek Kabelac 12 May '14

12 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c07fb7678ecb7ecf… Commit: c07fb7678ecb7ecf54e9acc4c2f3ef6138cec90f Parent: 506ade802b6e7f8c2afb027cd969bbb105afabd1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 9 17:10:26 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 12 16:24:40 2014 +0200 cleanup: drop unused header --- lib/locking/file_locking.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index 10431ab..d332101 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -22,7 +22,6 @@ #include "lvm-string.h" #include "lvm-flock.h" #include "lvmcache.h" -#include "lvm-signal.h" #include <limits.h> #include <unistd.h>

1 0

master - cleanup: cast int to typedef
by Zdenek Kabelac 12 May '14

12 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=506ade802b6e7f8c… Commit: 506ade802b6e7f8c2afb027cd969bbb105afabd1 Parent: 90c44f5371b85edb05d4c4ebbd9e0254971d13f4 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 9 16:13:48 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 12 16:24:40 2014 +0200 cleanup: cast int to typedef --- tools/vgchange.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index 2856b28..d24b17e 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -590,7 +590,7 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) if (arg_count(cmd, activate_ARG) && (arg_count(cmd, monitor_ARG) || arg_count(cmd, poll_ARG))) { - if (!is_change_activating(arg_uint_value(cmd, activate_ARG, 0))) { + if (!is_change_activating((activation_change_t) arg_uint_value(cmd, activate_ARG, 0))) { log_error("Only -ay* allowed with --monitor or --poll."); return EINVALID_CMD_LINE; }

1 0

master - conf: document new thin_check option
by Zdenek Kabelac 12 May '14

12 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=90c44f5371b85edb… Commit: 90c44f5371b85edb05d4c4ebbd9e0254971d13f4 Parent: 8b95c82fed667b4095b1358ac5697fd43cd61e11 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 12 14:12:55 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 12 16:24:40 2014 +0200 conf: document new thin_check option --- conf/example.conf.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in index d5ddb1c..bc1758d 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -693,8 +693,10 @@ global { # option "-q" is for quiet output. # With thin_check version 2.1 or newer you can add "--ignore-non-fatal-errors" # to let it pass through ignorable errors and fix them later. + # With thin_check version 3.2 or newer you should add + # "--clear-needs-check-flag". # - # thin_check_options = [ "-q" ] + # thin_check_options = [ "-q", "--clear-needs-check-flag" ] # Full path of the utility called to repair a thin metadata device # is in a state that allows it to be used.

1 0

master - coverity: catch unwanted path
by Zdenek Kabelac 12 May '14

12 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8b95c82fed667b40… Commit: 8b95c82fed667b4095b1358ac5697fd43cd61e11 Parent: 2e1192f6914ddbe1cf560a02158bdb58584efa26 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 9 17:10:51 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 12 16:24:39 2014 +0200 coverity: catch unwanted path We validate this path already earlier. --- lib/metadata/lv_manip.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index b47e2d2..2005826 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6140,6 +6140,11 @@ 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) { + log_error(INTERNAL_ERROR "Undefined pool for thin volume segment."); + return NULL; + } + if (!(lvl = find_lv_in_vg(vg, lp->pool))) { log_error("Unable to find existing pool LV %s in VG %s.", lp->pool, vg->name);

1 0

master - configure: improve needs_check thin_check test
by Zdenek Kabelac 12 May '14

12 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2e1192f6914ddbe1… Commit: 2e1192f6914ddbe1cf560a02158bdb58584efa26 Parent: 5b787a24f024d2589583fc356f343bb981c169e2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon May 12 14:51:23 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 12 16:24:39 2014 +0200 configure: improve needs_check thin_check test Improve testing for needs_check - when old tools are installed, issue proper warning from configure, but stop sending needs_check flag to the old tool. --- configure | 55 +++++++++++++++++++++++++++---------------------------- configure.in | 43 +++++++++++++++++++++---------------------- 2 files changed, 48 insertions(+), 50 deletions(-) diff --git a/configure b/configure index 44eab6f..dd5ec64 100755 --- a/configure +++ b/configure @@ -7208,8 +7208,6 @@ $as_echo "#define THIN_INTERNAL 1" >>confdefs.h *) as_fn_error $? "--with-thin parameter invalid ($THIN)" "$LINENO" 5 ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether thin_check supports the needs-check flag" >&5 -$as_echo_n "checking whether thin_check supports the needs-check flag... " >&6; } # Check whether --enable-thin_check_needs_check was given. if test "${enable_thin_check_needs_check+set}" = set; then : enableval=$enable_thin_check_needs_check; THIN_CHECK_NEEDS_CHECK=$enableval @@ -7217,14 +7215,6 @@ else THIN_CHECK_NEEDS_CHECK=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIN_CHECK_NEEDS_CHECK" >&5 -$as_echo "$THIN_CHECK_NEEDS_CHECK" >&6; } - -if test x$THIN_CHECK_NEEDS_CHECK = xyes; then - -$as_echo "#define THIN_CHECK_NEEDS_CHECK 1" >>confdefs.h - -fi # Test if necessary thin tools are available # if not - use plain defaults and warn user @@ -7335,24 +7325,23 @@ fi $as_echo "$as_me: WARNING: thin_check not found in path $PATH" >&2;} THIN_CHECK_CMD=/usr/sbin/thin_check THIN_CONFIGURE_WARN=y - else - if test x$THIN_CHECK_NEEDS_CHECK = xyes; then - THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null` - THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'` - THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'` - - if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&5 -$as_echo "$as_me: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&2;} - THIN_CHECK_VERSION_WARN=y - else - if test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&5 -$as_echo "$as_me: WARNING: Found thin_check version \"$THIN_CHECK_VSN\"" >&2;} - THIN_CHECK_VERSION_WARN=y - fi - fi - fi + fi + fi + if test "$THIN_CHECK_NEEDS_CHECK" = yes; then + THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null` + THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'` + THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'` + + if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $THIN_CHECK_CMD: Bad version \"$THIN_CHECK_VSN\" found" >&5 +$as_echo "$as_me: WARNING: $THIN_CHECK_CMD: Bad version \"$THIN_CHECK_VSN\" found" >&2;} + THIN_CHECK_VERSION_WARN=y + THIN_CHECK_NEEDS_CHECK=no + elif test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $THIN_CHECK_CMD: Old version \"$THIN_CHECK_VSN\" found" >&5 +$as_echo "$as_me: WARNING: $THIN_CHECK_CMD: Old version \"$THIN_CHECK_VSN\" found" >&2;} + THIN_CHECK_VERSION_WARN=y + THIN_CHECK_NEEDS_CHECK=no fi fi # Empty means a config way to ignore thin checking @@ -7572,6 +7561,16 @@ $as_echo "$as_me: WARNING: thin_repair not found in path $PATH" >&2;} ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether thin_check supports the needs-check flag" >&5 +$as_echo_n "checking whether thin_check supports the needs-check flag... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIN_CHECK_NEEDS_CHECK" >&5 +$as_echo "$THIN_CHECK_NEEDS_CHECK" >&6; } +if test "$THIN_CHECK_NEEDS_CHECK" = yes; then + +$as_echo "#define THIN_CHECK_NEEDS_CHECK 1" >>confdefs.h + +fi + cat >>confdefs.h <<_ACEOF #define THIN_CHECK_CMD "$THIN_CHECK_CMD" diff --git a/configure.in b/configure.in index 09ca1b5..3a8e5d9 100644 --- a/configure.in +++ b/configure.in @@ -433,16 +433,10 @@ case "$THIN" in esac dnl -- thin_check needs-check flag -AC_MSG_CHECKING(whether thin_check supports the needs-check flag) AC_ARG_ENABLE(thin_check_needs_check, AC_HELP_STRING([--disable-thin_check_needs_check], [required if thin_check version is < 0.3.0]), THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=yes) -AC_MSG_RESULT($THIN_CHECK_NEEDS_CHECK) - -if test x$THIN_CHECK_NEEDS_CHECK = xyes; then - AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option]) -fi # Test if necessary thin tools are available # if not - use plain defaults and warn user @@ -455,22 +449,21 @@ case "$THIN" in AC_MSG_WARN([thin_check not found in path $PATH]) THIN_CHECK_CMD=/usr/sbin/thin_check THIN_CONFIGURE_WARN=y - else - if test x$THIN_CHECK_NEEDS_CHECK = xyes; then - THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null` - THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'` - THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'` - - if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR" ; then - AC_MSG_WARN(Found thin_check version "$THIN_CHECK_VSN") - THIN_CHECK_VERSION_WARN=y - else - if test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3 ; then - AC_MSG_WARN(Found thin_check version "$THIN_CHECK_VSN") - THIN_CHECK_VERSION_WARN=y - fi - fi - fi + fi + fi + if test "$THIN_CHECK_NEEDS_CHECK" = yes; then + THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null` + THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'` + THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'` + + if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR"; then + AC_MSG_WARN([$THIN_CHECK_CMD: Bad version "$THIN_CHECK_VSN" found]) + THIN_CHECK_VERSION_WARN=y + THIN_CHECK_NEEDS_CHECK=no + elif test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3; then + AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found]) + THIN_CHECK_VERSION_WARN=y + THIN_CHECK_NEEDS_CHECK=no fi fi # Empty means a config way to ignore thin checking @@ -494,6 +487,12 @@ case "$THIN" in ;; esac +AC_MSG_CHECKING([whether thin_check supports the needs-check flag]) +AC_MSG_RESULT([$THIN_CHECK_NEEDS_CHECK]) +if test "$THIN_CHECK_NEEDS_CHECK" = yes; then + AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option]) +fi + AC_DEFINE_UNQUOTED([THIN_CHECK_CMD], ["$THIN_CHECK_CMD"], [The path to 'thin_check', if available.])

1 0

master - configure: drop siginterrupt
by Zdenek Kabelac 12 May '14

12 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5b787a24f024d258… Commit: 5b787a24f024d2589583fc356f343bb981c169e2 Parent: e416d84e1093655786b09450154779ee7896f11d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jul 6 11:22:29 2013 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon May 12 16:24:39 2014 +0200 configure: drop siginterrupt Not used anymore --- configure | 11 ----------- configure.in | 1 - lib/misc/configure.h.in | 3 --- lib/misc/lvm-wrappers.h | 15 --------------- 4 files changed, 0 insertions(+), 30 deletions(-) diff --git a/configure b/configure index de93e77..44eab6f 100755 --- a/configure +++ b/configure @@ -5563,17 +5563,6 @@ else fi done -for ac_func in siginterrupt -do : - ac_fn_c_check_func "$LINENO" "siginterrupt" "ac_cv_func_siginterrupt" -if test "x$ac_cv_func_siginterrupt" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SIGINTERRUPT 1 -_ACEOF - -fi -done - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 diff --git a/configure.in b/configure.in index e3ddde1..09ca1b5 100644 --- a/configure.in +++ b/configure.in @@ -134,7 +134,6 @@ AC_CHECK_FUNCS([ftruncate gethostname getpagesize \ gettimeofday memset mkdir mkfifo rmdir munmap nl_langinfo setenv setlocale \ strcasecmp strchr strcspn strspn strdup strncasecmp strerror strrchr \ strstr strtol strtoul uname], , [AC_MSG_ERROR(bailing out)]) -AC_CHECK_FUNCS(siginterrupt) AC_FUNC_ALLOCA AC_FUNC_CLOSEDIR_VOID AC_FUNC_CHOWN diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in index 507aae1..ead131c 100644 --- a/lib/misc/configure.h.in +++ b/lib/misc/configure.h.in @@ -288,9 +288,6 @@ /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE -/* Define to 1 if you have the `siginterrupt' function. */ -#undef HAVE_SIGINTERRUPT - /* Define to 1 if you have the <signal.h> header file. */ #undef HAVE_SIGNAL_H diff --git a/lib/misc/lvm-wrappers.h b/lib/misc/lvm-wrappers.h index 9368e25..137cbdb 100644 --- a/lib/misc/lvm-wrappers.h +++ b/lib/misc/lvm-wrappers.h @@ -37,19 +37,4 @@ int read_urandom(void *buf, size_t len); */ unsigned lvm_even_rand(unsigned *seed, unsigned max); -# ifndef HAVE_SIGINTERRUPT -# define siginterrupt(sig, flag) \ - do { \ - int ret; \ - struct sigaction act; \ - (void) sigaction(sig, NULL, &act); \ - if (flag) \ - act.sa_flags &= SA_RESTART; \ - else \ - act.sa_flags |= SA_RESTART; \ - ret = sigaction(sig, &act, NULL); \ - return ret; \ - while (0) -# endif - #endif

1 0

master - cleanup: use enum return codes
by Zdenek Kabelac 07 May '14

07 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e416d84e10936557… Commit: e416d84e1093655786b09450154779ee7896f11d Parent: 2cc02c570e489426568e57ad0b8fdbd9eedccf87 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 7 13:52:01 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 7 14:17:46 2014 +0200 cleanup: use enum return codes --- lib/misc/lvm-string.c | 16 ++++++++-------- lib/misc/lvm-string.h | 12 ++++++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c index cdee02b..be6298b 100644 --- a/lib/misc/lvm-string.c +++ b/lib/misc/lvm-string.c @@ -65,29 +65,29 @@ int validate_tag(const char *n) return 1; } -static int _validate_name(const char *n) +static name_error_t _validate_name(const char *n) { register char c; register int len = 0; if (!n || !*n) - return -1; + return NAME_INVALID_EMPTY; /* Hyphen used as VG-LV separator - ambiguity if LV starts with it */ if (*n == '-') - return -2; + return NAME_INVALID_HYPEN; if ((*n == '.') && (!n[1] || (n[1] == '.' && !n[2]))) /* ".", ".." */ - return -3; + return NAME_INVALID_DOTS; while ((len++, c = *n++)) if (!isalnum(c) && c != '.' && c != '_' && c != '-' && c != '+') - return -4; + return NAME_INVALID_CHARSET; if (len > NAME_LEN) - return -5; + return NAME_INVALID_LENGTH; - return 0; + return NAME_VALID; } /* @@ -98,7 +98,7 @@ static int _validate_name(const char *n) */ int validate_name(const char *n) { - return (_validate_name(n) < 0 ? 0 : 1); + return (_validate_name(n) == NAME_VALID) ? 1 : 0; } static const char *_lvname_has_reserved_prefix(const char *lvname) diff --git a/lib/misc/lvm-string.h b/lib/misc/lvm-string.h index a4f112f..6a13e9e 100644 --- a/lib/misc/lvm-string.h +++ b/lib/misc/lvm-string.h @@ -25,10 +25,14 @@ struct dm_pool; struct pool; struct logical_volume; -typedef enum name_error { NAME_VALID = 0, NAME_INVALID_EMPTY = -1, - NAME_INVALID_HYPEN = -2, NAME_INVALID_DOTS = -3, - NAME_INVALID_CHARSET = -4, NAME_INVALID_LENGTH = -5} - name_error_t; +typedef enum name_error { + NAME_VALID = 0, + NAME_INVALID_EMPTY = -1, + NAME_INVALID_HYPEN = -2, + NAME_INVALID_DOTS = -3, + NAME_INVALID_CHARSET = -4, + NAME_INVALID_LENGTH = -5 +} name_error_t; int emit_to_buffer(char **buffer, size_t *size, const char *fmt, ...) __attribute__ ((format(printf, 3, 4)));

1 0

master - cleanup: constify pointers
by Zdenek Kabelac 07 May '14

07 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2cc02c570e489426… Commit: 2cc02c570e489426568e57ad0b8fdbd9eedccf87 Parent: 9845f8c7674892d7760526b36e45c6425bd1950f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 7 13:09:59 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 7 14:17:46 2014 +0200 cleanup: constify pointers --- lib/device/dev-type.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index 9d610d4..e0cae45 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -460,9 +460,9 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name, uint32_t types_to_exclude, uint32_t types_no_prompt, int yes, force_t force) { - static const char _msg_failed_offset[] = "Failed to get offset of the %s signature on %s."; - static const char _msg_failed_length[] = "Failed to get length of the %s signature on %s."; - static const char _msg_wiping[] = "Wiping %s signature on %s."; + static const char const _msg_failed_offset[] = "Failed to get offset of the %s signature on %s."; + static const char const _msg_failed_length[] = "Failed to get length of the %s signature on %s."; + static const char const _msg_wiping[] = "Wiping %s signature on %s."; const char *offset = NULL, *type = NULL, *magic = NULL, *usage = NULL, *label = NULL, *uuid = NULL; loff_t offset_value;

1 0

master - clenaup: drop unused assigns
by Zdenek Kabelac 07 May '14

07 May '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9845f8c7674892d7… Commit: 9845f8c7674892d7760526b36e45c6425bd1950f Parent: 9bccaf7ae40ca0d17e5d1b65f7c7aaf2d78eb2b9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 7 11:58:43 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 7 14:17:46 2014 +0200 clenaup: drop unused assigns --- lib/metadata/cache_manip.c | 2 +- tools/lvcreate.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index 6a0f0f6..0e2569c 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -123,7 +123,7 @@ struct logical_volume *lv_cache_create(struct logical_volume *pool, return_NULL; cache_lv = origin; - if (!(origin = insert_layer_for_lv(cmd, cache_lv, CACHE, "_corig"))) + if (!insert_layer_for_lv(cmd, cache_lv, CACHE, "_corig")) return_NULL; seg = first_seg(cache_lv); diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 0e009b1..2156265 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -323,7 +323,6 @@ static int _determine_cache_argument(struct volume_group *vg, lp->poolmetadataspare = arg_int_value(vg->cmd, poolmetadataspare_ARG, DEFAULT_POOL_METADATA_SPARE); - lp->origin = lp->origin; } return 1;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits May 2014