lvm2-commits February 2016

lvm2-commits@lists.fedorahosted.org

8 participants
174 discussions

master - metadata: ask for confirmation before really initializing/removing PV that is marked as belonging to a VG
by Peter Rajnoha 18 Feb '16

18 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ecfa465366d2d6f2… Commit: ecfa465366d2d6f2a995111eef3c8dac3987c2ef Parent: 1a141e86238b45ed8c4a2f1f3b8918f40d33f5a9 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Feb 18 14:30:14 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Feb 18 14:33:54 2016 +0100 metadata: ask for confirmation before really initializing/removing PV that is marked as belonging to a VG Ask for confirmation when using pvcreate/pvremove on a PV which is marked as belonging to a VG, just like we do in case of a PV which belongs to known VG: $ pvcreate -ff /dev/sda Really INITIALIZE physical volume "/dev/sda" that is marked as belonging to a VG [y/n]? n /dev/sda: physical volume not initialized $ pvremove -ff /dev/sda Really WIPE LABELS from physical volume "/dev/sda" that is marked as belonging to a VG [y/n]? n /dev/sda: physical volume label not removed --- lib/metadata/metadata.c | 23 ++++++++++++++++++----- lib/metadata/pv_manip.c | 44 +++++++++++++++++++++++++------------------- test/shell/pv-ext-flags.sh | 8 ++++---- 3 files changed, 47 insertions(+), 28 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index ca7f9c7..8478abb 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1470,6 +1470,8 @@ int vg_split_mdas(struct cmd_context *cmd __attribute__((unused)), static int _pvcreate_check(struct cmd_context *cmd, const char *name, struct pvcreate_params *pp, int *wiped) { + static const char really_init_msg[] = "Really INITIALIZE physical volume"; + static const char not_init_msg[] = "physical volume not initialized"; struct physical_volume *pv; struct device *dev; int r = 0; @@ -1504,11 +1506,22 @@ static int _pvcreate_check(struct cmd_context *cmd, const char *name, } /* prompt */ - if (pv && !is_orphan(pv) && !pp->yes && - yes_no_prompt("Really INITIALIZE physical volume \"%s\" of volume group \"%s\" [y/n]? ", - name, pv_vg_name(pv)) == 'n') { - log_error("%s: physical volume not initialized", name); - goto out; + if (pv && !pp->yes) { + if (is_orphan(pv)) { + if (used) { + if (yes_no_prompt("%s \"%s\" that is marked as belonging to a VG [y/n]? ", + really_init_msg, name) == 'n') { + log_error("%s: %s", name, not_init_msg); + goto out; + } + } + } else { + if (yes_no_prompt("%s \"%s\" of volume group \"%s\" [y/n]? ", + really_init_msg, name, pv_vg_name(pv)) == 'n') { + log_error("%s: %s", name, not_init_msg); + goto out; + } + } } if (sigint_caught()) diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c index 423b647..8c3a5dd 100644 --- a/lib/metadata/pv_manip.c +++ b/lib/metadata/pv_manip.c @@ -687,9 +687,6 @@ out: return r; } -const char _really_wipe[] = - "Really WIPE LABELS from physical volume \"%s\" of volume group \"%s\" [y/n]? "; - /* * Decide whether it is "safe" to wipe the labels on this device. * 0 indicates we may not. @@ -697,6 +694,8 @@ const char _really_wipe[] = static int pvremove_check(struct cmd_context *cmd, const char *name, unsigned force_count, unsigned prompt, struct dm_list *pvslist) { + static const char really_wipe_msg[] = "Really WIPE LABELS from physical volume"; + static const char not_removed_msg[] = "physical volume label not removed"; static const char pvremove_force_hint_msg[] = "(If you are certain you need pvremove, then confirm by using --force twice.)"; struct device *dev; struct label *label; @@ -741,25 +740,32 @@ static int pvremove_check(struct cmd_context *cmd, const char *name, log_error("%s", pvremove_force_hint_msg); goto out; } - - r = 1; - goto out; - } - - /* we must have -ff to overwrite a non orphan */ - if (force_count < 2) { - log_error("PV %s belongs to Volume Group %s so please use vgreduce first.", name, pv_vg_name(pv)); - log_error("%s", pvremove_force_hint_msg); - goto out; + } else { + /* we must have -ff to overwrite a non orphan */ + if (force_count < 2) { + log_error("PV %s belongs to Volume Group %s so please use vgreduce first.", name, pv_vg_name(pv)); + log_error("%s", pvremove_force_hint_msg); + goto out; + } } /* prompt */ - if (!prompt && - yes_no_prompt("Really WIPE LABELS from physical volume \"%s\" " - "of volume group \"%s\" [y/n]? ", - name, pv_vg_name(pv)) == 'n') { - log_error("%s: physical volume label not removed", name); - goto out; + if (!prompt) { + if (is_orphan(pv)) { + if (used) { + if (yes_no_prompt("%s \"%s\" that is marked as belonging to a VG [y/n]? ", + really_wipe_msg, name) == 'n') { + log_error("%s: %s", name, not_removed_msg); + goto out; + } + } + } else { + if (yes_no_prompt("%s \"%s\" of volume group \"%s\" [y/n]? ", + really_wipe_msg, name, pv_vg_name(pv)) == 'n') { + log_error("%s: %s", name, not_removed_msg); + goto out; + } + } } if (force_count) { diff --git a/test/shell/pv-ext-flags.sh b/test/shell/pv-ext-flags.sh index 072ec2c..5b35aa4 100644 --- a/test/shell/pv-ext-flags.sh +++ b/test/shell/pv-ext-flags.sh @@ -55,9 +55,9 @@ grep "$MARKED_AS_USED_MSG" err dd if="$dev1" of=dev1_backup bs=1M # pvcreate and pvremove can be forced even if the PV is marked as used -pvremove -ff "$dev1" +pvremove -ff -y "$dev1" dd if=dev1_backup of="$dev1" bs=1M -pvcreate -ff "$dev1" +pvcreate -ff -y "$dev1" dd if=dev1_backup of="$dev1" bs=1M # prepare a VG with $dev1 and $dev both having 1 MDA @@ -120,9 +120,9 @@ grep "$MARKED_AS_USED_MSG" err dd if="$dev1" of=dev1_backup bs=1M # pvcreate and pvremove can be forced even if the PV is marked as used -pvremove -ff "$dev1" +pvremove -ff -y "$dev1" dd if=dev1_backup of="$dev1" bs=1M -pvcreate -ff "$dev1" +pvcreate -ff -y "$dev1" dd if=dev1_backup of="$dev1" bs=1M # prepare a VG with $dev1 and $dev both having 1 MDA

1 0

master - lbmdbusd: Support in-tree testing.
by Alasdair Kergon 18 Feb '16

18 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1a141e86238b45ed… Commit: 1a141e86238b45ed8c4a2f1f3b8918f40d33f5a9 Parent: ef5583a209f5ec1ac0d950705f79c4d948050439 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Feb 18 13:26:08 2016 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Feb 18 13:26:08 2016 +0000 lbmdbusd: Support in-tree testing. --- daemons/lvmdbusd/Makefile.in | 2 +- daemons/lvmdbusd/__init__.py | 2 +- daemons/lvmdbusd/lvmdbusd.py | 140 ----------------------------------- daemons/lvmdbusd/main.py | 140 +++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 142 deletions(-) diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in index 4b6c71c..658fcd8 100644 --- a/daemons/lvmdbusd/Makefile.in +++ b/daemons/lvmdbusd/Makefile.in @@ -27,7 +27,7 @@ LVMDBUS_SRCDIR_FILES = \ job.py \ loader.py \ lvmdb.py \ - lvmdbusd.py \ + main.py \ lvm_shell_proxy.py \ lv.py \ manager.py \ diff --git a/daemons/lvmdbusd/__init__.py b/daemons/lvmdbusd/__init__.py index db14fe9..25dcfdf 100644 --- a/daemons/lvmdbusd/__init__.py +++ b/daemons/lvmdbusd/__init__.py @@ -7,4 +7,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from .lvmdbusd import main +from .main import main diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py b/daemons/lvmdbusd/lvm_shell_proxy.py old mode 100644 new mode 100755 diff --git a/daemons/lvmdbusd/lvmdb.py b/daemons/lvmdbusd/lvmdb.py old mode 100644 new mode 100755 diff --git a/daemons/lvmdbusd/lvmdbusd.py b/daemons/lvmdbusd/lvmdbusd.py deleted file mode 100644 index 43545b2..0000000 --- a/daemons/lvmdbusd/lvmdbusd.py +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -from . import cfg -from . import objectmanager -from . import utils -from .cfg import BASE_INTERFACE, BASE_OBJ_PATH, MANAGER_OBJ_PATH -import threading -from . import cmdhandler -import time -import signal -import dbus -from . import lvmdb -# noinspection PyUnresolvedReferences -from gi.repository import GObject -from .fetch import load -from .manager import Manager -from .background import background_reaper -import traceback -import queue -import sys -from . import udevwatch -from .utils import log_debug -import argparse - - -class Lvm(objectmanager.ObjectManager): - def __init__(self, object_path): - super(Lvm, self).__init__(object_path, BASE_INTERFACE) - - -def process_request(): - while cfg.run.value != 0: - try: - req = cfg.worker_q.get(True, 5) - - start = cfg.db.num_refreshes - - log_debug( - "Running method: %s with args %s" % - (str(req.method), str(req.arguments))) - req.run_cmd() - - end = cfg.db.num_refreshes - - if end - start > 1: - log_debug( - "Inspect method %s for too many refreshes" % - (str(req.method))) - log_debug("Complete ") - except queue.Empty: - pass - except Exception: - traceback.print_exc(file=sys.stdout) - pass - - -def main(): - # Add simple command line handling - parser = argparse.ArgumentParser() - parser.add_argument("--udev", action='store_true', - help="Use udev for updating state", default=False, - dest='use_udev') - parser.add_argument("--debug", action='store_true', - help="Dump debug messages", default=False, - dest='debug') - - args = parser.parse_args() - - cfg.DEBUG = args.debug - - # List of threads that we start up - thread_list = [] - - start = time.time() - - # Install signal handlers - for s in [signal.SIGHUP, signal.SIGINT]: - try: - signal.signal(s, utils.handler) - except RuntimeError: - pass - - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) - GObject.threads_init() - dbus.mainloop.glib.threads_init() - cfg.bus = dbus.SystemBus() - # The base name variable needs to exist for things to work. - # noinspection PyUnusedLocal - base_name = dbus.service.BusName(BASE_INTERFACE, cfg.bus) - cfg.om = Lvm(BASE_OBJ_PATH) - cfg.om.register_object(Manager(MANAGER_OBJ_PATH)) - - cfg.load = load - - cfg.db = lvmdb.DataStore() - - # Start up thread to monitor pv moves - thread_list.append( - threading.Thread(target=background_reaper, name="pv_move_reaper")) - - # Using a thread to process requests. - thread_list.append(threading.Thread(target=process_request)) - - cfg.load(refresh=False, emit_signal=False) - cfg.loop = GObject.MainLoop() - - for process in thread_list: - process.damon = True - process.start() - - end = time.time() - log_debug( - 'Service ready! total time= %.2f, lvm time= %.2f count= %d' % - (end - start, cmdhandler.total_time, cmdhandler.total_count), - 'bg_black', 'fg_light_green') - - # Add udev watching - if args.use_udev: - log_debug('Utilizing udev to trigger updates') - udevwatch.add() - - try: - if cfg.run.value != 0: - cfg.loop.run() - - if args.use_udev: - udevwatch.remove() - - for process in thread_list: - process.join() - except KeyboardInterrupt: - utils.handler(signal.SIGINT, None) - return 0 diff --git a/daemons/lvmdbusd/main.py b/daemons/lvmdbusd/main.py new file mode 100644 index 0000000..43545b2 --- /dev/null +++ b/daemons/lvmdbusd/main.py @@ -0,0 +1,140 @@ +# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from . import cfg +from . import objectmanager +from . import utils +from .cfg import BASE_INTERFACE, BASE_OBJ_PATH, MANAGER_OBJ_PATH +import threading +from . import cmdhandler +import time +import signal +import dbus +from . import lvmdb +# noinspection PyUnresolvedReferences +from gi.repository import GObject +from .fetch import load +from .manager import Manager +from .background import background_reaper +import traceback +import queue +import sys +from . import udevwatch +from .utils import log_debug +import argparse + + +class Lvm(objectmanager.ObjectManager): + def __init__(self, object_path): + super(Lvm, self).__init__(object_path, BASE_INTERFACE) + + +def process_request(): + while cfg.run.value != 0: + try: + req = cfg.worker_q.get(True, 5) + + start = cfg.db.num_refreshes + + log_debug( + "Running method: %s with args %s" % + (str(req.method), str(req.arguments))) + req.run_cmd() + + end = cfg.db.num_refreshes + + if end - start > 1: + log_debug( + "Inspect method %s for too many refreshes" % + (str(req.method))) + log_debug("Complete ") + except queue.Empty: + pass + except Exception: + traceback.print_exc(file=sys.stdout) + pass + + +def main(): + # Add simple command line handling + parser = argparse.ArgumentParser() + parser.add_argument("--udev", action='store_true', + help="Use udev for updating state", default=False, + dest='use_udev') + parser.add_argument("--debug", action='store_true', + help="Dump debug messages", default=False, + dest='debug') + + args = parser.parse_args() + + cfg.DEBUG = args.debug + + # List of threads that we start up + thread_list = [] + + start = time.time() + + # Install signal handlers + for s in [signal.SIGHUP, signal.SIGINT]: + try: + signal.signal(s, utils.handler) + except RuntimeError: + pass + + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + GObject.threads_init() + dbus.mainloop.glib.threads_init() + cfg.bus = dbus.SystemBus() + # The base name variable needs to exist for things to work. + # noinspection PyUnusedLocal + base_name = dbus.service.BusName(BASE_INTERFACE, cfg.bus) + cfg.om = Lvm(BASE_OBJ_PATH) + cfg.om.register_object(Manager(MANAGER_OBJ_PATH)) + + cfg.load = load + + cfg.db = lvmdb.DataStore() + + # Start up thread to monitor pv moves + thread_list.append( + threading.Thread(target=background_reaper, name="pv_move_reaper")) + + # Using a thread to process requests. + thread_list.append(threading.Thread(target=process_request)) + + cfg.load(refresh=False, emit_signal=False) + cfg.loop = GObject.MainLoop() + + for process in thread_list: + process.damon = True + process.start() + + end = time.time() + log_debug( + 'Service ready! total time= %.2f, lvm time= %.2f count= %d' % + (end - start, cmdhandler.total_time, cmdhandler.total_count), + 'bg_black', 'fg_light_green') + + # Add udev watching + if args.use_udev: + log_debug('Utilizing udev to trigger updates') + udevwatch.add() + + try: + if cfg.run.value != 0: + cfg.loop.run() + + if args.use_udev: + udevwatch.remove() + + for process in thread_list: + process.join() + except KeyboardInterrupt: + utils.handler(signal.SIGINT, None) + return 0

1 0

master - Fix rpm builds
by Marian Csontos 18 Feb '16

18 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ef5583a209f5ec1a… Commit: ef5583a209f5ec1ac0d950705f79c4d948050439 Parent: bc19a16fc7d952550849b1f6359ed0515515f0aa Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Feb 18 12:36:43 2016 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Feb 18 12:37:44 2016 +0100 Fix rpm builds --- spec/build.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/build.inc b/spec/build.inc index bc57436..2bb285d 100644 --- a/spec/build.inc +++ b/spec/build.inc @@ -30,7 +30,7 @@ %enableif %{enable_lockd_dlm} lockd-dlm %enableif %{enable_lockd_sanlock} lockd-sanlock %endif -%enableif %{enable_python} python-bindings +%enableif %{enable_python} python2-bindings %enableif %{enable_python} applib %build @@ -39,7 +39,7 @@ rm -rf %{py3dir} cp -a . %{py3dir} pushd %{py3dir} -%configure %{configure_flags} PYTHON=/usr/bin/python3 PYTHON_CONFIG=/usr/bin/python3-config +%configure %{configure_flags} --disable-python2-bindings --enable-python3-bindings PYTHON=/usr/bin/python3 PYTHON_CONFIG=/usr/bin/python3-config make %{?_smp_mflags} popd

1 0

master - report: report -1, not 'unkown' for lv_{snapshot_invalid, merge_failed} with --binary
by Peter Rajnoha 18 Feb '16

18 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bc19a16fc7d95255… Commit: bc19a16fc7d952550849b1f6359ed0515515f0aa Parent: e5fc48411a5e872eb7c34dff51aa7e0910812119 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Feb 18 12:10:00 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Feb 18 12:10:00 2016 +0100 report: report -1, not 'unkown' for lv_{snapshot_invalid,merge_failed} with --binary State: $ lvs -o lv_name,lv_active_locally,lv_snapshot_invalid,lv_merge_failed vg/lvol0 LV ActLocal SnapInvalid MergeFailed lvol0 active locally unknown unknown Now with using --binary switch. Before this patch (lv_snapshot_invalid and lv_merge_failed not switched into numeric value where -1 represents 'unknown' value) $ lvs -o lv_name,lv_active_locally,lv_snapshot_invalid,lv_merge_failed vg/lvol0 --binary LV ActLocal SnapInvalid MergeFailed lvol0 1 unknown unknown With this patch applied: $ lvs -o lv_name,lv_active_locally,lv_snapshot_invalid,lv_merge_failed vg/lvol0 --binary LV ActLocal SnapInvalid MergeFailed lvol0 1 -1 -1 --- WHATS_NEW | 1 + lib/report/report.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a4474cd..bf3fc07 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.143 - ===================================== + Report -1, not 'unkown' for lv_{snapshot_invalid,merge_failed} with --binary. Add configure --enable-dbus-service for an LVM D-Bus service. Replace configure --enable-python_bindings with python2 and python3 versions. If PV belongs to some VG and metadata missing, skip it if system ID is used. diff --git a/lib/report/report.c b/lib/report/report.c index 123b9f0..542cbc4 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -3194,7 +3194,7 @@ static int _lvmergefailed_disp(struct dm_report *rh, struct dm_pool *mem, int merge_failed; if (!lv_is_cow(lv) || !lv_snapshot_percent(lv, &snap_percent)) - return _field_set_value(field, _str_unknown, &GET_TYPE_RESERVED_VALUE(num_undef_64)); + return _binary_undef_disp(rh, mem, field, private); merge_failed = snap_percent == LVM_PERCENT_MERGE_FAILED; return _binary_disp(rh, mem, field, merge_failed, GET_FIRST_RESERVED_NAME(lv_merge_failed_y), private); @@ -3209,7 +3209,7 @@ static int _lvsnapshotinvalid_disp(struct dm_report *rh, struct dm_pool *mem, int snap_invalid; if (!lv_is_cow(lv)) - return _field_set_value(field, _str_unknown, &GET_TYPE_RESERVED_VALUE(num_undef_64)); + return _binary_undef_disp(rh, mem, field, private); snap_invalid = !lv_snapshot_percent(lv, &snap_percent) || snap_percent == DM_PERCENT_INVALID; return _binary_disp(rh, mem, field, snap_invalid, GET_FIRST_RESERVED_NAME(lv_snapshot_invalid_y), private);

1 0

master - man: fix list of restricted LV name suffixes
by Peter Rajnoha 17 Feb '16

17 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=055c628e38589bf1… Commit: 055c628e38589bf1ea66bc0b2c5da36ed115b551 Parent: 065526c59084d3d47de476acee2d095199e9412d Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed Feb 17 15:38:27 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed Feb 17 15:38:27 2016 +0100 man: fix list of restricted LV name suffixes --- man/lvm.8.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/lvm.8.in b/man/lvm.8.in index 4f801c9..fe30b75 100644 --- a/man/lvm.8.in +++ b/man/lvm.8.in @@ -489,7 +489,7 @@ not be used as LV or VG names. A VG cannot be called anything that exists in An LV cannot be called '.', '..', 'snapshot' or 'pvmove'. The LV name may also not contain any of the following strings: \fR'_cdata', '_cmeta', '_corig', '_mlog', '_mimage', '_pmspare', -\fR'_rimage', '_rlog', '_tdata' or '_tmeta'. +\fR'_rimage', '_rmeta', '_tdata', '_tmeta' or '_vorigin'. A directory bearing the name of each Volume Group is created under \fI/dev\fP when any of its Logical Volumes are activated. Each active Logical Volume is accessible from this directory as a symbolic

1 0

master - metadata: add missing _repair_inconsinstent_vg call during PV ext repair
by Peter Rajnoha 17 Feb '16

17 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=065526c59084d3d4… Commit: 065526c59084d3d47de476acee2d095199e9412d Parent: b077e7374f6bcb4ad5d8d9247553301ce75fa38e Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Feb 16 15:50:32 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed Feb 17 10:19:55 2016 +0100 metadata: add missing _repair_inconsinstent_vg call during PV ext repair --- lib/metadata/metadata.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 3b59e65..ca7f9c7 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3723,6 +3723,8 @@ static int _check_or_repair_pv_ext(struct cmd_context *cmd, struct lvmcache_info *info; uint32_t ext_version, ext_flags; struct pv_list *pvl; + unsigned pvs_fixed = 0; + int r = 0; *inconsistent_pvs = 0; @@ -3733,7 +3735,7 @@ static int _check_or_repair_pv_ext(struct cmd_context *cmd, if (!(info = lvmcache_info_from_pvid(pvl->pv->dev->pvid, 0))) { log_error("Failed to find cached info for PV %s.", pv_dev_name(pvl->pv)); - return 0; + goto out; } ext_version = lvmcache_ext_version(info); @@ -3744,7 +3746,10 @@ static int _check_or_repair_pv_ext(struct cmd_context *cmd, if (!(ext_flags & PV_EXT_USED)) { if (!repair) { *inconsistent_pvs = 1; - continue; + /* we're not repairing now, so no need to + * check further PVs - inconsistent_pvs is already + * set and that will trigger the repair next time */ + return 1; } if (_is_foreign_vg(vg)) { @@ -3762,13 +3767,19 @@ static int _check_or_repair_pv_ext(struct cmd_context *cmd, *inconsistent_pvs = 1; log_error("Failed to repair physical volume \"%s\".", pv_dev_name(pvl->pv)); - return 0; + goto out; } + pvs_fixed++; } } } - return 1; + r = 1; +out: + if ((pvs_fixed > 0) && !_repair_inconsistent_vg(vg)) + return_0; + + return r; } /* Caller sets consistent to 1 if it's safe for vg_read_internal to correct

1 0

master - metadata: do not repair missing PV_EXT_USED flag for PVs belonging to foreign VG
by Peter Rajnoha 17 Feb '16

17 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b077e7374f6bcb4a… Commit: b077e7374f6bcb4ad5d8d9247553301ce75fa38e Parent: 13f3e926326ae528d1a62d9786f462e7d7c73037 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Feb 16 13:55:31 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed Feb 17 10:19:24 2016 +0100 metadata: do not repair missing PV_EXT_USED flag for PVs belonging to foreign VG The host that owns foreign VGs is responsible for fixing up PV_EXT_USED flag - the same already applies to repairing any inconsistent VG. This patch also moves the iteration over vg->pvs inside _check_or_repair_pv_ext fn - it's cleaner this way. --- lib/metadata/metadata.c | 109 +++++++++++++++++++++++++---------------------- 1 files changed, 58 insertions(+), 51 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 4dbe38b..3b59e65 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3632,52 +3632,6 @@ static int _is_foreign_vg(struct volume_group *vg) return vg->cmd->system_id && strcmp(vg->system_id, vg->cmd->system_id); } -static int _check_or_repair_pv_ext(struct cmd_context *cmd, - struct physical_volume *pv, - int repair, int *inconsistent_pvs) -{ - struct lvmcache_info *info; - uint32_t ext_version, ext_flags; - - /* Missing PV - nothing to do. */ - if (!pv->dev) - return 1; - - if (!(info = lvmcache_info_from_pvid(pv->dev->pvid, 0))) { - log_error("Failed to find cached info for PV %s.", pv_dev_name(pv)); - return 0; - } - - ext_version = lvmcache_ext_version(info); - if (ext_version < 2) { - *inconsistent_pvs = 0; - return 1; - } - - ext_flags = lvmcache_ext_flags(info); - if (!(ext_flags & PV_EXT_USED)) { - if (!repair) { - *inconsistent_pvs = 1; - return 1; - } - - log_warn("WARNING: Repairing Physical Volume %s that is " - "in Volume Group %s but not marked as used.", - pv_dev_name(pv), pv->vg->name); - - /* pv write will set correct ext_flags */ - if (!pv_write(cmd, pv, 1)) { - *inconsistent_pvs = 1; - log_error("Failed to repair physical volume \"%s\".", - pv_dev_name(pv)); - return 0; - } - } - - *inconsistent_pvs = 0; - return 1; -} - static int _repair_inconsistent_vg(struct volume_group *vg) { unsigned saved_handles_missing_pvs = vg->cmd->handles_missing_pvs; @@ -3762,6 +3716,61 @@ next_pv: return 1; } +static int _check_or_repair_pv_ext(struct cmd_context *cmd, + struct volume_group *vg, + int repair, int *inconsistent_pvs) +{ + struct lvmcache_info *info; + uint32_t ext_version, ext_flags; + struct pv_list *pvl; + + *inconsistent_pvs = 0; + + dm_list_iterate_items(pvl, &vg->pvs) { + /* Missing PV - nothing to do. */ + if (is_missing_pv(pvl->pv)) + continue; + + if (!(info = lvmcache_info_from_pvid(pvl->pv->dev->pvid, 0))) { + log_error("Failed to find cached info for PV %s.", pv_dev_name(pvl->pv)); + return 0; + } + + ext_version = lvmcache_ext_version(info); + if (ext_version < 2) + continue; + + ext_flags = lvmcache_ext_flags(info); + if (!(ext_flags & PV_EXT_USED)) { + if (!repair) { + *inconsistent_pvs = 1; + continue; + } + + if (_is_foreign_vg(vg)) { + log_verbose("Skip repair of PV %s that is in foreign " + "VG %s but not marked as used.", + pv_dev_name(pvl->pv), vg->name); + *inconsistent_pvs = 1; + } else { + log_warn("WARNING: Repairing Physical Volume %s that is " + "in Volume Group %s but not marked as used.", + pv_dev_name(pvl->pv), vg->name); + + /* pv write will set correct ext_flags */ + if (!pv_write(cmd, pvl->pv, 1)) { + *inconsistent_pvs = 1; + log_error("Failed to repair physical volume \"%s\".", + pv_dev_name(pvl->pv)); + return 0; + } + } + } + } + + return 1; +} + /* Caller sets consistent to 1 if it's safe for vg_read_internal to correct * inconsistent metadata on disk (i.e. the VG write lock is held). * This guarantees only consistent metadata is returned. @@ -4260,11 +4269,9 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, } /* We have the VG now finally, check if PV ext info is in sync with VG metadata. */ - dm_list_iterate_items(pvl, &correct_vg->pvs) { - if (!_check_or_repair_pv_ext(cmd, pvl->pv, *consistent, &inconsistent_pvs)) { - release_vg(correct_vg); - return_NULL; - } + if (!_check_or_repair_pv_ext(cmd, correct_vg, *consistent, &inconsistent_pvs)) { + release_vg(correct_vg); + return_NULL; } *consistent = !inconsistent_pvs;

1 0

master - refactor: add common _is_foreign_vg fn
by Peter Rajnoha 17 Feb '16

17 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=13f3e926326ae528… Commit: 13f3e926326ae528d1a62d9786f462e7d7c73037 Parent: 45be3c875f4605f4f950e8abfa12cf422526f5db Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Feb 16 13:44:48 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Feb 16 13:44:48 2016 +0100 refactor: add common _is_foreign_vg fn --- lib/metadata/metadata.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index eb50c0a..4dbe38b 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3627,6 +3627,11 @@ static int _check_reappeared_pv(struct volume_group *correct_vg, return rv; } +static int _is_foreign_vg(struct volume_group *vg) +{ + return vg->cmd->system_id && strcmp(vg->system_id, vg->cmd->system_id); +} + static int _check_or_repair_pv_ext(struct cmd_context *cmd, struct physical_volume *pv, int repair, int *inconsistent_pvs) @@ -3678,7 +3683,7 @@ static int _repair_inconsistent_vg(struct volume_group *vg) unsigned saved_handles_missing_pvs = vg->cmd->handles_missing_pvs; /* Cannot write foreign VGs, the owner will repair it. */ - if (vg->cmd->system_id && strcmp(vg->system_id, vg->cmd->system_id)) { + if (_is_foreign_vg(vg)) { log_verbose("Skip metadata repair for foreign VG."); return 0; } @@ -3718,7 +3723,7 @@ static int _wipe_outdated_pvs(struct cmd_context *cmd, struct volume_group *vg, * some PVs look outdated to us just because we're reading * the VG while it's only partially written out. */ - if (cmd->system_id && strcmp(vg->system_id, cmd->system_id)) { + if (_is_foreign_vg(vg)) { log_debug_metadata("Skip wiping outdated PVs for foreign VG."); return 0; }

1 0

master - pv: use pv->fmt to check for fake PVs, not pv->vg
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=45be3c875f4605f4… Commit: 45be3c875f4605f4f950e8abfa12cf422526f5db Parent: 099d99975c25ba4f4c0593b778c95e7e185fd527 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Feb 15 15:50:11 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 15:52:13 2016 +0100 pv: use pv->fmt to check for fake PVs, not pv->vg pv->vg is not set yet during pvcreate processing. Use pv->fmt instead to check for these fake PVs (all normal PVs have format defined, devices which are not PVs don't have this set). This fixes commit 0000db7f98a07aa31c5b1cf13938b612e7f2821b. --- lib/metadata/pv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/pv.c b/lib/metadata/pv.c index d5820b5..1d68045 100644 --- a/lib/metadata/pv.c +++ b/lib/metadata/pv.c @@ -213,7 +213,7 @@ int is_used_pv(const struct physical_volume *pv) struct lvmcache_info *info; uint32_t ext_flags; - if (!pv->vg) + if (!pv->fmt) return 0; if (!is_orphan(pv))

1 0

master - cleanup: make the message about marked PVs consistent with the others
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=099d99975c25ba4f… Commit: 099d99975c25ba4f4c0593b778c95e7e185fd527 Parent: cc9e683adcb6c56332d708baf02dec63eba4fba9 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Feb 15 15:20:23 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 15:20:23 2016 +0100 cleanup: make the message about marked PVs consistent with the others --- tools/toollib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/toollib.c b/tools/toollib.c index 1bdc113..22c38a1 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -3068,7 +3068,7 @@ static int _process_pvs_in_vg(struct cmd_context *cmd, pv_name = pv_dev_name(pv); if (cmd->system_id && is_orphan(pv) && is_used_pv(pv)) { - log_verbose("PV %s is belonging to a VG but its metadata is missing.", pv_name); + log_verbose("PV %s is marked as belonging to a VG but its metadata is missing.", pv_name); log_verbose("Skipping PV %s because it's not possible to decide whether it matches system id.", pv_name); continue; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
18
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits February 2016