master - blk-availability: use blkdeactivate -r wait in blk-availability systemd service/initscript
by Peter Rajnoha
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=584b4ae38bca05c0bbc...
Commit: 584b4ae38bca05c0bbc6a097b549372c39727f3b
Parent: 95087c8f96c784cb91bda1433599abe75d917b80
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Thu Sep 21 15:10:23 2017 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Thu Sep 21 17:10:15 2017 +0200
blk-availability: use blkdeactivate -r wait in blk-availability systemd service/initscript
---
WHATS_NEW_DM | 1 +
scripts/blk_availability_init_red_hat.in | 2 +-
.../blk_availability_systemd_red_hat.service.in | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 783a542..df72a25 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.144 -
======================================
+ Use blkdeactivate -r wait in blk-availability systemd service/initscript.
Add blkdeactivate -r wait option to wait for MD resync/recovery/reshape.
Fix blkdeactivate regression with failing DM/MD devs deactivation (1.02.142).
Fix typo in blkdeactivate's '--{dm,lvm,mpath}options' option name.
diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
index 657616e..73d52ac 100644
--- a/scripts/blk_availability_init_red_hat.in
+++ b/scripts/blk_availability_init_red_hat.in
@@ -33,7 +33,7 @@
sbindir=@sbindir@
script=blkdeactivate
-options="-u -l wholevg -m disablequeueing"
+options="-u -l wholevg -m disablequeueing -r wait"
LOCK_FILE="/var/lock/subsys/blk-availability"
diff --git a/scripts/blk_availability_systemd_red_hat.service.in b/scripts/blk_availability_systemd_red_hat.service.in
index cc4c678..10c3f44 100644
--- a/scripts/blk_availability_systemd_red_hat.service.in
+++ b/scripts/blk_availability_systemd_red_hat.service.in
@@ -7,7 +7,7 @@ Conflicts=shutdown.target
[Service]
Type=oneshot
ExecStart=/usr/bin/true
-ExecStop=@sbindir@/blkdeactivate -u -l wholevg -m disablequeueing
+ExecStop=@sbindir@/blkdeactivate -u -l wholevg -m disablequeueing -r wait
RemainAfterExit=yes
[Install]
6 years, 6 months
master - blkdeactivate: add blkdeactivate -r wait option to wait for MD resync/recovery/reshape
by Peter Rajnoha
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=95087c8f96c784cb91b...
Commit: 95087c8f96c784cb91bda1433599abe75d917b80
Parent: 7fa0d5226297a9ef57b8bce986e7a17ce948beb3
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Thu Sep 21 15:04:45 2017 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Thu Sep 21 17:10:15 2017 +0200
blkdeactivate: add blkdeactivate -r wait option to wait for MD resync/recovery/reshape
The new blkdeactivate -r|mdraidoption wait causes blkdeactivate to wait
for any resync/recovery/reshape that is currently in progress before
deactivating the device.
If this option is used, blkdeactivate calls mdadm -W|--wait before
mdadm -S|--stop.
---
WHATS_NEW_DM | 1 +
man/blkdeactivate.8_main | 9 ++++++++
scripts/blkdeactivate.sh.in | 49 ++++++++++++++++++++++++++++++++++++------
3 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 576e308..783a542 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.144 -
======================================
+ Add blkdeactivate -r wait option to wait for MD resync/recovery/reshape.
Fix blkdeactivate regression with failing DM/MD devs deactivation (1.02.142).
Fix typo in blkdeactivate's '--{dm,lvm,mpath}options' option name.
Correct return value testing when get reserved values for reporting.
diff --git a/man/blkdeactivate.8_main b/man/blkdeactivate.8_main
index 80235ca..0aa9c2a 100644
--- a/man/blkdeactivate.8_main
+++ b/man/blkdeactivate.8_main
@@ -8,6 +8,7 @@ blkdeactivate \(em utility to deactivate block devices
.RB [ -h ]
.RB [ -l \ \fIlvm_options\fP ]
.RB [ -m \ \fImpath_options\fP ]
+.RB [ -r \ \fImdraid_options\fP ]
.RB [ -u ]
.RB [ -v ]
.RI [ device ]
@@ -62,6 +63,14 @@ all the paths are unavailable for any underlying device-mapper multipath
device.
.RE
.TP
+.BR -r ", " --mdraidoption \ \fImdraid_options\fP
+Comma-separated list of MD RAID specific options:
+.RS
+.IP \fIwait\fP
+Wait MD device's resync, recovery or reshape action to complete
+before deactivation.
+.RE
+.TP
.BR -u ", " --umount
Unmount a mounted device before trying to deactivate it.
Without this option used, a device that is mounted is not deactivated.
diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
index a7606b5..71cc241 100644
--- a/scripts/blkdeactivate.sh.in
+++ b/scripts/blkdeactivate.sh.in
@@ -71,6 +71,9 @@ LVM_DO_WHOLE_VG=0
# Do not retry LV deactivation by default.
LVM_CONFIG="activation{retry_deactivation=0}"
+# Do not wait for MD RAID device resync, recovery or reshape.
+MDRAID_DO_WAIT=0
+
# Do not disable queueing if set on multipath devices.
MPATHD_DO_DISABLEQUEUEING=0
@@ -113,13 +116,14 @@ usage() {
echo " If devices are specified, deactivate only supplied devices and their holders."
echo
echo " Options:"
- echo " -e | --errors Show errors reported from tools"
- echo " -h | --help Show this help message"
- echo " -d | --dmoptions DM_OPTIONS Comma separated DM specific options"
- echo " -l | --lvmoptions LVM_OPTIONS Comma separated LVM specific options"
- echo " -m | --mpathoptions MPATH_OPTIONS Comma separated DM-multipath specific options"
- echo " -u | --umount Unmount the device if mounted"
- echo " -v | --verbose Verbose mode (also implies -e)"
+ echo " -e | --errors Show errors reported from tools"
+ echo " -h | --help Show this help message"
+ echo " -d | --dmoptions DM_OPTIONS Comma separated DM specific options"
+ echo " -l | --lvmoptions LVM_OPTIONS Comma separated LVM specific options"
+ echo " -m | --mpathoptions MPATH_OPTIONS Comma separated DM-multipath specific options"
+ echo " -r | --mdraidoptions MDRAID_OPTIONS Comma separated MD RAID specific options"
+ echo " -u | --umount Unmount the device if mounted"
+ echo " -v | --verbose Verbose mode (also implies -e)"
echo
echo " Device specific options:"
echo " DM_OPTIONS:"
@@ -128,6 +132,8 @@ usage() {
echo " LVM_OPTIONS:"
echo " retry retry removal several times in case of failure"
echo " wholevg deactivate the whole VG when processing an LV"
+ echo " MDRAID_OPTIONS:"
+ echo " wait wait for resync, recovery or reshape to complete first"
echo " MPATH_OPTIONS:"
echo " disablequeueing disable queueing on all DM-multipath devices first"
@@ -275,6 +281,7 @@ deactivate_lvm () {
deactivate_md () {
local name=$(printf "%s" "$name")
+ local sync_action
test -b "$DEV_DIR/$name" || return 0
test -z "${SKIP_DEVICE_LIST["$kname"]}" || return 1
@@ -287,6 +294,19 @@ deactivate_md () {
deactivate_holders "$DEV_DIR/$name" || return 1
echo -n " [MD]: deactivating $devtype device $kname... "
+
+ test "$MDRAID_DO_WAIT" -eq 1 && {
+ sync_action="$(cat $SYS_BLK_DIR/$kname/md/sync_action)"
+ test "$sync_action" != "idle" && {
+ echo -n "$sync_action action in progress... "
+ if eval "$MDADM" $MDADM_OPTS -W "$DEV_DIR/$kname" "$OUT" "$ERR"; then
+ echo -n "complete... "
+ else
+ test $? -ne 1 && echo -n "failed to wait for $sync_action action... "
+ fi
+ }
+ }
+
if eval "$MDADM" $MDADM_OPTS -S "$name" "$OUT" "$ERR"; then
echo "done"
else
@@ -427,6 +447,20 @@ get_lvmopts() {
IFS=$ORIG_IFS
}
+get_mdraidopts() {
+ ORIG_IFS=$IFS; IFS=','
+
+ for opt in $1; do
+ case "$opt" in
+ "") ;;
+ "wait") MDRAID_DO_WAIT=1 ;;
+ *) echo "$opt: unknown MD RAID option"
+ esac
+ done
+
+ IFS=$ORIG_IFS
+}
+
get_mpathopts() {
ORIG_IFS=$IFS; IFS=','
@@ -489,6 +523,7 @@ while test $# -ne 0; do
"-d"|"--dmoptions") get_dmopts "$2" ; shift ;;
"-l"|"--lvmoptions") get_lvmopts "$2" ; shift ;;
"-m"|"--mpathoptions") get_mpathopts "$2" ; shift ;;
+ "-r"|"--mdraidoptions") get_mdraidopts "$2"; shift ;;
"-u"|"--umount") DO_UMOUNT=1 ;;
"-v"|"--verbose") VERBOSE=1 ; ERRORS=1 ;;
"-vv") VERBOSE=1 ; ERRORS=1 ; set -x ;;
6 years, 6 months
master - blkdeactivate: fix blkdeactivate regression with failing DM/MD devs deactivation
by Peter Rajnoha
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7fa0d5226297a9ef57b...
Commit: 7fa0d5226297a9ef57b8bce986e7a17ce948beb3
Parent: 9f34125d5d6f0755af8b99ec9ca04495cf8d8df6
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Thu Sep 21 13:39:52 2017 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Thu Sep 21 17:10:15 2017 +0200
blkdeactivate: fix blkdeactivate regression with failing DM/MD devs deactivation
Revert dc50f2f4a03dd50c5e2411a258095484555421e9.
We're canonicalizing/escaping the names here and we're reusing the
variable name so the code doesn't need to use extra variables and
further assignments that may confuse us. Let's keep the code simple.
The
local name=(...$name)
is not the same as
local name
name=(...$name)
(I know various code-checking tools fuss about this and recommend
the 2nd way, but let's ignore those tools' nitpicking here please.)
---
WHATS_NEW_DM | 1 +
scripts/blkdeactivate.sh.in | 8 ++------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 2060ada..576e308 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.144 -
======================================
+ Fix blkdeactivate regression with failing DM/MD devs deactivation (1.02.142).
Fix typo in blkdeactivate's '--{dm,lvm,mpath}options' option name.
Correct return value testing when get reserved values for reporting.
Take -S with dmsetup suspend/resume/clear/wipe_table/remove/deps/status/table.
diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
index 61c7a86..a7606b5 100644
--- a/scripts/blkdeactivate.sh.in
+++ b/scripts/blkdeactivate.sh.in
@@ -205,9 +205,7 @@ deactivate_holders () {
}
deactivate_dm () {
- local name
-
- name=$(printf "%s" "$name")
+ local name=$(printf "%s" "$name")
test -b "$DEV_DIR/mapper/$name" || return 0
test -z "${SKIP_DEVICE_LIST["$kname"]}" || return 1
@@ -276,9 +274,7 @@ deactivate_lvm () {
}
deactivate_md () {
- local name
-
- name=$(printf "%s" "$name")
+ local name=$(printf "%s" "$name")
test -b "$DEV_DIR/$name" || return 0
test -z "${SKIP_DEVICE_LIST["$kname"]}" || return 1
6 years, 6 months
master - blkdeactivate: fix --{dm, lvm, mpath}options option name recognition
by Peter Rajnoha
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9f34125d5d6f0755af8...
Commit: 9f34125d5d6f0755af8b99ec9ca04495cf8d8df6
Parent: 0ab9e4b6a720972cffc8bc465f4d4c3d788d0820
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Thu Sep 21 17:03:42 2017 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Thu Sep 21 17:08:44 2017 +0200
blkdeactivate: fix --{dm,lvm,mpath}options option name recognition
There was a typo in blkdeactivate --dmoption/--lvmoption/mpathoption,
it had missing "s" at the end and it was not recognized properly, only
short names for the options (-d/-l/-m).
---
WHATS_NEW_DM | 1 +
man/blkdeactivate.8_main | 6 +++---
scripts/blkdeactivate.sh.in | 20 ++++++++++----------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 2a351a4..2060ada 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.144 -
======================================
+ Fix typo in blkdeactivate's '--{dm,lvm,mpath}options' option name.
Correct return value testing when get reserved values for reporting.
Take -S with dmsetup suspend/resume/clear/wipe_table/remove/deps/status/table.
diff --git a/man/blkdeactivate.8_main b/man/blkdeactivate.8_main
index 9a0e84e..80235ca 100644
--- a/man/blkdeactivate.8_main
+++ b/man/blkdeactivate.8_main
@@ -22,7 +22,7 @@ based devices are handled using the \fBdmsetup\fP(8) command.
MD devices are handled using the \fBmdadm\fP(8) command.
.SH OPTIONS
.TP
-.BR -d ", " --dmoption \ \fIdm_options\fP
+.BR -d ", " --dmoptions \ \fIdm_options\fP
Comma separated list of device-mapper specific options.
Accepted \fBdmsetup\fP(8) options are:
.RS
@@ -41,7 +41,7 @@ the device was skipped.
.BR -h ", " --help
Display the help text.
.TP
-.BR -l ", " --lvmoption \ \fIlvm_options\fP
+.BR -l ", " --lvmoptions \ \fIlvm_options\fP
Comma-separated list of LVM specific options:
.RS
.IP \fIretry\fP
@@ -52,7 +52,7 @@ Deactivating the Volume Group as a whole is quicker than deactivating
each Logical Volume separately.
.RE
.TP
-.BR -m ", " --mpathoption \ \fImpath_options\fP
+.BR -m ", " --mpathoptions \ \fImpath_options\fP
Comma-separated list of device-mapper multipath specific options:
.RS
.IP \fIdisablequeueing\fP
diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
index 969eace..61c7a86 100644
--- a/scripts/blkdeactivate.sh.in
+++ b/scripts/blkdeactivate.sh.in
@@ -113,13 +113,13 @@ usage() {
echo " If devices are specified, deactivate only supplied devices and their holders."
echo
echo " Options:"
- echo " -e | --errors Show errors reported from tools"
- echo " -h | --help Show this help message"
- echo " -d | --dmoption DM_OPTIONS Comma separated DM specific options"
- echo " -l | --lvmoption LVM_OPTIONS Comma separated LVM specific options"
- echo " -m | --mpathoption MPATH_OPTIONS Comma separated DM-multipath specific options"
- echo " -u | --umount Unmount the device if mounted"
- echo " -v | --verbose Verbose mode (also implies -e)"
+ echo " -e | --errors Show errors reported from tools"
+ echo " -h | --help Show this help message"
+ echo " -d | --dmoptions DM_OPTIONS Comma separated DM specific options"
+ echo " -l | --lvmoptions LVM_OPTIONS Comma separated LVM specific options"
+ echo " -m | --mpathoptions MPATH_OPTIONS Comma separated DM-multipath specific options"
+ echo " -u | --umount Unmount the device if mounted"
+ echo " -v | --verbose Verbose mode (also implies -e)"
echo
echo " Device specific options:"
echo " DM_OPTIONS:"
@@ -490,9 +490,9 @@ while test $# -ne 0; do
"") ;;
"-e"|"--errors") ERRORS=1 ;;
"-h"|"--help") usage ;;
- "-d"|"--dmoption ") get_dmopts "$2" ; shift ;;
- "-l"|"--lvmoption ") get_lvmopts "$2" ; shift ;;
- "-m"|"--mpathoption ") get_mpathopts "$2" ; shift ;;
+ "-d"|"--dmoptions") get_dmopts "$2" ; shift ;;
+ "-l"|"--lvmoptions") get_lvmopts "$2" ; shift ;;
+ "-m"|"--mpathoptions") get_mpathopts "$2" ; shift ;;
"-u"|"--umount") DO_UMOUNT=1 ;;
"-v"|"--verbose") VERBOSE=1 ; ERRORS=1 ;;
"-vv") VERBOSE=1 ; ERRORS=1 ; set -x ;;
6 years, 6 months
master - improve error messages when command rules fail
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0ab9e4b6a720972cffc...
Commit: 0ab9e4b6a720972cffc8bc465f4d4c3d788d0820
Parent: f2ee0e7aca6020cf273f22dc5bca20bfa3c89051
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Sep 20 10:51:52 2017 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Sep 20 11:10:35 2017 -0500
improve error messages when command rules fail
When certain cmd def RULE's fail, the error messages can
sometimes be confusing. This expands the error messages
to help clarify why the rule failed, especially in cases
where options are used incorrectly.
---
tools/command-lines.in | 2 +-
tools/toollib.c | 34 +++++++++++++++++++++++++---------
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index ec02fa4..265bda8 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -677,7 +677,7 @@ DESC: Replace failed PVs in a raid or mirror LV.
DESC: Repair a thin pool.
DESC: Repair a cache pool.
RULE: all not lv_is_locked lv_is_pvmove
-RULE: --poolmetadataspare Bool and LV_cache LV_cachepool LV_thinpool
+RULE: --poolmetadataspare and LV_cache LV_cachepool LV_thinpool
lvconvert --replace PV LV_raid
OO: OO_LVCONVERT
diff --git a/tools/toollib.c b/tools/toollib.c
index bf3e9d6..b28167b 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2819,7 +2819,7 @@ static int _check_lv_rules(struct cmd_context *cmd, struct logical_volume *lv)
if (rule->check_opts && (rule->rule == RULE_INVALID) && opts_match_count) {
memset(buf, 0, sizeof(buf));
opt_array_to_str(cmd, rule->check_opts, rule->check_opts_count, buf, sizeof(buf));
- log_warn("Command on LV %s does not accept option %s.",
+ log_warn("Command on LV %s has invalid use of option %s.",
display_lvname(lv), buf);
ret = 0;
}
@@ -2837,8 +2837,12 @@ static int _check_lv_rules(struct cmd_context *cmd, struct logical_volume *lv)
/* Fail if the LV matches any of the invalid LV types. */
if (rule->check_lvt_bits && (rule->rule == RULE_INVALID) && lv_types_match_bits) {
- log_warn("Command on LV %s does not accept LV type %s.",
- display_lvname(lv), lvtype ? lvtype->name : "unknown");
+ if (rule->opts_count)
+ log_warn("Command on LV %s uses options invalid with LV type %s.",
+ display_lvname(lv), lvtype ? lvtype->name : "unknown");
+ else
+ log_warn("Command on LV %s with invalid LV type %s.",
+ display_lvname(lv), lvtype ? lvtype->name : "unknown");
ret = 0;
}
@@ -2847,8 +2851,12 @@ static int _check_lv_rules(struct cmd_context *cmd, struct logical_volume *lv)
if (rule->check_lvt_bits && (rule->rule == RULE_REQUIRE) && !lv_types_match_bits) {
memset(buf, 0, sizeof(buf));
lvt_bits_to_str(rule->check_lvt_bits, buf, sizeof(buf));
- log_warn("Command on LV %s does not accept LV type %s. Required LV types are %s.",
- display_lvname(lv), lvtype ? lvtype->name : "unknown", buf);
+ if (rule->opts_count)
+ log_warn("Command on LV %s uses options that require LV types %s.",
+ display_lvname(lv), buf);
+ else
+ log_warn("Command on LV %s does not accept LV type %s. Required LV types are %s.",
+ display_lvname(lv), lvtype ? lvtype->name : "unknown", buf);
ret = 0;
}
@@ -2857,8 +2865,12 @@ static int _check_lv_rules(struct cmd_context *cmd, struct logical_volume *lv)
if (rule->check_lvp_bits && (rule->rule == RULE_INVALID) && lv_props_match_bits) {
memset(buf, 0, sizeof(buf));
lvp_bits_to_str(lv_props_match_bits, buf, sizeof(buf));
- log_warn("Command on LV %s does not accept LV with properties: %s.",
- display_lvname(lv), buf);
+ if (rule->opts_count)
+ log_warn("Command on LV %s uses options that are invalid with LV properties: %s.",
+ display_lvname(lv), buf);
+ else
+ log_warn("Command on LV %s is invalid on LV with properties: %s.",
+ display_lvname(lv), buf);
ret = 0;
}
@@ -2867,8 +2879,12 @@ static int _check_lv_rules(struct cmd_context *cmd, struct logical_volume *lv)
if (rule->check_lvp_bits && (rule->rule == RULE_REQUIRE) && lv_props_unmatch_bits) {
memset(buf, 0, sizeof(buf));
lvp_bits_to_str(lv_props_unmatch_bits, buf, sizeof(buf));
- log_warn("Command on LV %s requires LV with properties: %s.",
- display_lvname(lv), buf);
+ if (rule->opts_count)
+ log_warn("Command on LV %s uses options that require LV properties: %s.",
+ display_lvname(lv), buf);
+ else
+ log_warn("Command on LV %s requires LV with properties: %s.",
+ display_lvname(lv), buf);
ret = 0;
}
}
6 years, 6 months
master - pvmove: require LV name in a shared VG
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f2ee0e7aca6020cf273...
Commit: f2ee0e7aca6020cf273f22dc5bca20bfa3c89051
Parent: 518a8e8cfbb672c2bf5e3455f1fe7cd8d94eb5b0
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Sep 19 13:08:41 2017 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Sep 20 09:56:51 2017 -0500
pvmove: require LV name in a shared VG
In a shared VG, only allow pvmove with a named LV,
so that only PE's used by the LV will be moved.
The LV is then activated exclusively, ensuring that
the PE's being moved are not used from another host.
Previously, pvmove was mistakenly allowed on a full PV.
This won't work when LVs using that PV are active on
other hosts.
---
WHATS_NEW | 1 +
lib/metadata/mirror.c | 2 +-
man/lvmlockd.8_main | 3 +++
tools/pvmove.c | 42 ++++++++++++++++++++++++------------------
4 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 6d820bd..6b88fc4 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.175 -
======================================
+ Require LV name with pvmove in a shared VG.
Allow shared active mirror LVs with lvmlockd, dlm, and cmirrord.
Support lvconvert --repair with cache and cachepool volumes.
lvconvert --repair respects --poolmetadataspare option.
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index e775495..238ce37 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -2145,7 +2145,7 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv,
}
}
- if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm")) {
+ if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm") && cmd->lockd_lv_sh) {
if (!cluster_mirror_is_available(cmd)) {
log_error("Shared cluster mirrors are not available.");
return 0;
diff --git a/man/lvmlockd.8_main b/man/lvmlockd.8_main
index 067c60d..b7eba1a 100644
--- a/man/lvmlockd.8_main
+++ b/man/lvmlockd.8_main
@@ -826,6 +826,9 @@ using external origins for thin LVs
splitting mirrors and snapshots from LVs
.br
\[bu]
+pvmove of entire PVs, or under LVs activated with shared locks
+.br
+\[bu]
vgsplit
.br
\[bu]
diff --git a/tools/pvmove.c b/tools/pvmove.c
index eef5cc1..750f08e 100644
--- a/tools/pvmove.c
+++ b/tools/pvmove.c
@@ -480,7 +480,7 @@ static struct logical_volume *_set_up_pvmove_lv(struct cmd_context *cmd,
* If the VG is clustered, we are unable to handle
* snapshots, origins, thin types, RAID or mirror
*/
- if (vg_is_clustered(vg) &&
+ if ((vg_is_clustered(vg) || is_lockd_type(vg->lock_type)) &&
(lv_is_origin(lv) || lv_is_cow(lv) ||
lv_is_thin_type(lv) || lv_is_raid_type(lv))) {
log_print_unless_silent("Skipping %s LV %s",
@@ -692,6 +692,7 @@ static int _pvmove_setup_single(struct cmd_context *cmd,
struct dm_list *allocatable_pvs;
struct dm_list *lvs_changed;
struct logical_volume *lv_mirr;
+ struct logical_volume *lv = NULL;
const char *pv_name = pv_dev_name(pv);
unsigned flags = PVMOVE_FIRST_TIME;
unsigned exclusive;
@@ -712,27 +713,32 @@ static int _pvmove_setup_single(struct cmd_context *cmd,
pp->setup_result = EINVALID_CMD_LINE;
return ECMD_FAILED;
}
+
+ if (!(lv = find_lv(vg, lv_name))) {
+ log_error("Failed to find LV with name %s", lv_name);
+ return ECMD_FAILED;
+ }
}
/*
- * We cannot move blocks from under the sanlock leases, so disallow
- * pvmoving any PVs used by the lvmlock LV.
+ * We would need to avoid any PEs used by LVs that are active (ex) on
+ * other hosts. For LVs that are active on multiple hosts (sh), we
+ * would need to used cluster mirrors.
*/
- if (vg->lock_type && !strcmp(vg->lock_type, "sanlock")) {
- struct lv_segment *lvseg;
- struct physical_volume *sanlock_pv;
- unsigned s;
-
- dm_list_iterate_items(lvseg, &vg->sanlock_lv->segments) {
- for (s = 0; s < lvseg->area_count; s++) {
- if (seg_type(lvseg, s) == AREA_PV) {
- sanlock_pv = seg_pv(lvseg, s);
- if (sanlock_pv->dev == pv->dev) {
- log_error("Cannot pvmove device %s used for sanlock leases.", pv_name);
- return ECMD_FAILED;
- }
- }
- }
+ if (is_lockd_type(vg->lock_type)) {
+ if (!lv) {
+ log_error("pvmove in a shared VG requires a named LV.");
+ return ECMD_FAILED;
+ }
+
+ if (lv_is_lockd_sanlock_lv(lv)) {
+ log_error("pvmove not allowed on internal sanlock LV.");
+ return ECMD_FAILED;
+ }
+
+ if (!lockd_lv(cmd, lv, "ex", LDLV_PERSISTENT)) {
+ log_error("pvmove in a shared VG requires exclusive lock on named LV.");
+ return ECMD_FAILED;
}
}
6 years, 6 months
master - lvmlockd: activate mirror LVs in shared mode with cmirrord
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=518a8e8cfbb672c2bf5...
Commit: 518a8e8cfbb672c2bf5e3455f1fe7cd8d94eb5b0
Parent: d9f9ce126856245541a66492f35422ab060a837e
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Sep 19 11:52:36 2017 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Sep 20 09:55:34 2017 -0500
lvmlockd: activate mirror LVs in shared mode with cmirrord
Previously lvmlockd disallowed mirror LVs to be activated
in shared mode.
---
WHATS_NEW | 1 +
lib/commands/toolcontext.h | 1 +
lib/locking/lvmlockd.c | 38 +++++++++++++++++++++++++++++++++++++-
lib/metadata/mirror.c | 12 ++++++++++++
lib/mirror/mirrored.c | 9 +++++++++
man/lvmlockd.8_main | 6 ++++--
6 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 7927673..6d820bd 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.175 -
======================================
+ Allow shared active mirror LVs with lvmlockd, dlm, and cmirrord.
Support lvconvert --repair with cache and cachepool volumes.
lvconvert --repair respects --poolmetadataspare option.
diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index 20b24f9..bf2b251 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -160,6 +160,7 @@ struct cmd_context {
unsigned lockd_vg_rescan:1;
unsigned lockd_vg_default_sh:1;
unsigned lockd_vg_enforce_sh:1;
+ unsigned lockd_lv_sh:1;
unsigned vg_notify:1;
unsigned lv_notify:1;
unsigned pv_notify:1;
diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c
index 058d4b5..0f2b160 100644
--- a/lib/locking/lvmlockd.c
+++ b/lib/locking/lvmlockd.c
@@ -2042,6 +2042,15 @@ int lockd_lv_name(struct cmd_context *cmd, struct volume_group *vg,
return 0;
}
+ /*
+ * This is a hack for mirror LVs which need to know at a very low level
+ * which lock mode the LV is being activated with so that it can pick
+ * a mirror log type during activation. Do not use this for anything
+ * else.
+ */
+ if (mode && !strcmp(mode, "sh"))
+ cmd->lockd_lv_sh = 1;
+
if (!mode)
mode = "ex";
@@ -2160,6 +2169,31 @@ static int _lockd_lv_thin(struct cmd_context *cmd, struct logical_volume *lv,
}
/*
+ * Only the combination of dlm + corosync + cmirrord allows
+ * mirror LVs to be activated in shared mode on multiple nodes.
+ */
+static int _lockd_lv_mirror(struct cmd_context *cmd, struct logical_volume *lv,
+ const char *def_mode, uint32_t flags)
+{
+ if (!strcmp(lv->vg->lock_type, "sanlock"))
+ flags |= LDLV_MODE_NO_SH;
+
+ else if (!strcmp(lv->vg->lock_type, "dlm") && def_mode && !strcmp(def_mode, "sh")) {
+#ifdef CMIRRORD_PIDFILE
+ if (!cmirrord_is_running()) {
+ log_error("cmirrord must be running to activate an LV in shared mode.");
+ return 0;
+ }
+#else
+ flags |= LDLV_MODE_NO_SH;
+#endif
+ }
+
+ return lockd_lv_name(cmd, lv->vg, lv->name, &lv->lvid.id[1],
+ lv->lock_args, def_mode, flags);
+}
+
+/*
* If the VG has no lock_type, then this function can return immediately.
* The LV itself may have no lock (NULL lv->lock_args), but the lock request
* may be directed to another lock, e.g. the pool LV lock in _lockd_lv_thin.
@@ -2212,12 +2246,14 @@ int lockd_lv(struct cmd_context *cmd, struct logical_volume *lv,
*/
if (lv_is_external_origin(lv) ||
lv_is_thin_type(lv) ||
- lv_is_mirror_type(lv) ||
lv_is_raid_type(lv) ||
lv_is_cache_type(lv)) {
flags |= LDLV_MODE_NO_SH;
}
+ if (lv_is_mirror_type(lv))
+ return _lockd_lv_mirror(cmd, lv, def_mode, flags);
+
return lockd_lv_name(cmd, lv->vg, lv->name, &lv->lvid.id[1],
lv->lock_args, def_mode, flags);
}
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index 7496ddc..e775495 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -2145,6 +2145,18 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv,
}
}
+ if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm")) {
+ if (!cluster_mirror_is_available(cmd)) {
+ log_error("Shared cluster mirrors are not available.");
+ return 0;
+ }
+
+ if (log_count > 1) {
+ log_error("Log type, \"mirrored\", is unavailable to cluster mirrors.");
+ return 0;
+ }
+ }
+
/* For corelog mirror, activation code depends on
* the global mirror_in_sync status. As we are adding
* a new mirror, it should be set as 'out-of-sync'
diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index f4c1567..4891fb7 100644
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -285,6 +285,15 @@ static int _add_log(struct dm_pool *mem, struct lv_segment *seg,
if (!laopts->exclusive && vg_is_clustered(seg->lv->vg))
clustered = 1;
+ else if (seg->lv->vg->lock_type && !strcmp(seg->lv->vg->lock_type, "dlm")) {
+ /*
+ * If shared lock was used due to -asy, then we set clustered
+ * to use a clustered mirror log with cmirrod.
+ */
+ if (seg->lv->vg->cmd->lockd_lv_sh)
+ clustered = 1;
+ }
+
if (seg->log_lv) {
/* If disk log, use its UUID */
if (!(log_dlid = build_dm_uuid(mem, seg->log_lv, NULL))) {
diff --git a/man/lvmlockd.8_main b/man/lvmlockd.8_main
index 1dbdaf9..067c60d 100644
--- a/man/lvmlockd.8_main
+++ b/man/lvmlockd.8_main
@@ -601,9 +601,11 @@ report an error and fail.
The shared mode is intended for a multi-host/cluster application or
file system.
LV types that cannot be used concurrently
-from multiple hosts include thin, cache, raid, mirror, and snapshot.
+from multiple hosts include thin, cache, raid, and snapshot.
lvextend on LV with shared locks is not yet allowed. The LV must be
-deactivated, or activated exclusively to run lvextend.
+deactivated, or activated exclusively to run lvextend. (LVs with
+the mirror type can be activated in shared mode from multiple hosts
+when using the dlm lock type and cmirrord.)
.IP \fBn\fP
The command deactivates the LV. After deactivating the LV, the command
6 years, 6 months
master - tests: use portable df output
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d9f9ce126856245541a...
Commit: d9f9ce126856245541a66492f35422ab060a837e
Parent: a15b7961468682496f9b51d9a07223e3dd6eba3f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Sep 20 15:34:02 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 20 15:34:02 2017 +0200
tests: use portable df output
For awk parsing more 'predictable' format of output line is needed.
---
test/lib/inittest.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/lib/inittest.sh b/test/lib/inittest.sh
index 7b0bc13..a33748d 100644
--- a/test/lib/inittest.sh
+++ b/test/lib/inittest.sh
@@ -125,7 +125,7 @@ fi
echo "$TESTNAME" >TESTNAME
# Require 50M of free space in testdir
-test $(df -k . | awk '/\// {print $4}') -gt 51200 ||
+test $(df -k -P . | awk '/\// {print $4}') -gt 51200 ||
die "Testing requires more then 50M of free space in directory $TESTDIR!\n$(df -H)"
echo "Kernel is $(uname -a)"
6 years, 6 months
master - tests: repair of cachepool
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a15b7961468682496f9...
Commit: a15b7961468682496f9b51d9a07223e3dd6eba3f
Parent: 2fd2b197ab5962bc0a1e7eb25bba120d7501032f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Sep 20 12:28:39 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 20 15:14:16 2017 +0200
tests: repair of cachepool
---
test/shell/lvconvert-repair-cache.sh | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/test/shell/lvconvert-repair-cache.sh b/test/shell/lvconvert-repair-cache.sh
index c68fdbd..5470e3f 100644
--- a/test/shell/lvconvert-repair-cache.sh
+++ b/test/shell/lvconvert-repair-cache.sh
@@ -60,6 +60,24 @@ aux enable_dev "$dev1"
lvcreate --type cache-pool -L10 $vg/cpool "$dev1"
lvconvert -H --cachemode writethrough --cachepool $vg/cpool -Zy $lv1
+# Check basic --repair of cachepool metadata
+lvchange -an $vg/$lv1
+lvconvert --repair $vg/$lv1
+
+lvs -a $vg
+check lv_exists $vg ${lv1}_meta0
+
+eval $(lvs -S 'name=~_pmspare' -a --config 'report/mark_hidden_devices=0' -o name --noheading --nameprefixes $vg)
+lvremove -f --yes "$vg/$LVM2_LV_NAME"
+
+# check --repair without creation of _pmspare device
+lvconvert --repair --poolmetadataspare n $vg/$lv1
+check lv_exists $vg ${lv1}_meta1
+
+# check no _pmspare has been created in previous --repair
+test "0" = $(lvs -S 'name=~_pmspare' -a -o name --noheading --nameprefixes $vg | wc -l)
+
+
aux disable_dev "$dev2"
# Deactivate before remove
@@ -71,11 +89,6 @@ not lvconvert --uncache $vg/$lv1
# --yes to drop when Check its prompting
lvconvert --yes --uncache $vg/$lv1
-#lvconvert --repair $vg/$lv1 -vvvvv
-#/$lv1
-
-#lvchange -ay $vg
-
aux enable_dev "$dev2"
# FIXME: temporary workaround
6 years, 6 months
master - tests: check for free space in test dir
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2fd2b197ab5962bc0a1...
Commit: 2fd2b197ab5962bc0a1e7eb25bba120d7501032f
Parent: a02db1c45ab571d0c614d269a713b56cd47c2e1e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Sep 11 14:33:07 2017 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 20 15:14:16 2017 +0200
tests: check for free space in test dir
Avoid starting test, when test dir has less then 50M of free space.
Better to crash early before letting die machine on weird crash
in OOM cases...
Also show free disk space when test starts
---
test/lib/inittest.sh | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/test/lib/inittest.sh b/test/lib/inittest.sh
index d5ca6fd..7b0bc13 100644
--- a/test/lib/inittest.sh
+++ b/test/lib/inittest.sh
@@ -124,11 +124,17 @@ fi
echo "$TESTNAME" >TESTNAME
+# Require 50M of free space in testdir
+test $(df -k . | awk '/\// {print $4}') -gt 51200 ||
+ die "Testing requires more then 50M of free space in directory $TESTDIR!\n$(df -H)"
+
echo "Kernel is $(uname -a)"
# Report SELinux mode
echo "Selinux mode is $(getenforce 2>/dev/null || echo not installed)."
free -m || true
+df -h || true
+
# Set vars from utils now that we have TESTDIR/PREFIX/...
prepare_test_vars
6 years, 6 months