master - shellcheck: fsadm cleanup
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d45a9c0f5b2c5c7d509...
Commit: d45a9c0f5b2c5c7d5098abc056174fa09f88cc58
Parent: 0f0baec1f36d712e9611ea31bde0ad904aa08f33
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Nov 5 18:22:02 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Nov 7 21:26:11 2017 +0100
shellcheck: fsadm cleanup
Use some more "" for bash vars
---
scripts/fsadm.sh | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 4f402ce..a09b915 100755
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -532,7 +532,7 @@ detect_luks_device() {
CRYPT_NAME=""
CRYPT_DATA_OFFSET=""
- _LUKS_VERSION=$($CRYPTSETUP luksDump $VOLUME 2> /dev/null | $GREP "Version:")
+ _LUKS_VERSION=$("$CRYPTSETUP" luksDump "$VOLUME" 2> /dev/null | "$GREP" "Version:")
if [ -z "$_LUKS_VERSION" ]; then
verbose "Failed to parse LUKS version on volume \"$VOLUME\""
@@ -541,7 +541,7 @@ detect_luks_device() {
_LUKS_VERSION=${_LUKS_VERSION//[Version:[:space:]]/}
- _LUKS_UUID=$($CRYPTSETUP luksDump $VOLUME 2> /dev/null | $GREP "UUID:")
+ _LUKS_UUID=$("$CRYPTSETUP" luksDump "$VOLUME" 2> /dev/null | "$GREP" "UUID:")
if [ -z "$_LUKS_UUID" ]; then
verbose "Failed to parse LUKS UUID on volume \"$VOLUME\""
@@ -551,10 +551,10 @@ detect_luks_device() {
_LUKS_UUID="CRYPT-LUKS$_LUKS_VERSION-${_LUKS_UUID//[UID:[:space:]-]/}-"
CRYPT_NAME=$(dmsetup info -c --noheadings -S "UUID=~^$_LUKS_UUID&&segments=1&&devnos_used='$MAJOR:$MINOR'" -o name)
- test -z "$CRYPT_NAME" || CRYPT_DATA_OFFSET=$(dmsetup table $CRYPT_NAME | cut -d ' ' -f 8)
+ test -z "$CRYPT_NAME" || CRYPT_DATA_OFFSET=$(dmsetup table "$CRYPT_NAME" | cut -d ' ' -f 8)
# LUKS device must be active and mapped over volume where detected
- if [ -z "$CRYPT_NAME" -o -z "$CRYPT_DATA_OFFSET" ]; then
+ if [ -z "$CRYPT_NAME" ] || [ -z "$CRYPT_DATA_OFFSET" ]; then
error "Can not find active LUKS device. Unlock \"$VOLUME\" volume first."
fi
}
@@ -599,7 +599,7 @@ resize_luks() {
fi
# resize LUKS device
- dry $CRYPTSETUP resize $NAME --size $L_NEWBLOCKCOUNT || error "Failed to resize active LUKS device"
+ dry "$CRYPTSETUP" resize "$NAME" --size $L_NEWBLOCKCOUNT || error "Failed to resize active LUKS device"
if [ $SHRINK -eq 0 ]; then
# grow fs on top of LUKS device
@@ -612,9 +612,9 @@ detect_crypt_device() {
local L_NEWSIZE
local TMP
- which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize crypt device"
+ which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize crypt device"
- CRYPT_TYPE=$($CRYPTSETUP status $1 2> /dev/null | $GREP "type:")
+ CRYPT_TYPE=$("$CRYPTSETUP" status "$1" 2> /dev/null | "$GREP" "type:")
test -n "$CRYPT_TYPE" || error "$CRYPTSETUP failed to detect device type on $1."
@@ -651,7 +651,7 @@ detect_crypt_device() {
# (on direct user request only)
#################################
resize_crypt() {
- dry $CRYPTSETUP resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1"
+ dry "$CRYPTSETUP" resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1"
}
####################
@@ -674,7 +674,7 @@ resize() {
"reiserfs") resize_reiser $NEWSIZE ;;
"xfs") resize_xfs $NEWSIZE ;;
"crypto_LUKS")
- which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume"
+ which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume"
resize_luks $NEWSIZE ;;
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
esac || error "Resize $FSTYPE failed."
@@ -746,7 +746,7 @@ check() {
*) dry "$FSCK" $FORCE -p "$VOLUME" ;;
esac ;;
"crypto_LUKS")
- which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required."
+ which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required."
check_luks ;;
*)
error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
6 years, 4 months
master - blkdeactive: use /sbin for mdamd
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0f0baec1f36d712e961...
Commit: 0f0baec1f36d712e9611ea31bde0ad904aa08f33
Parent: 2354fb3fe45c6e2739a0a902f378c70c5422ac48
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 3 17:06:16 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Nov 7 21:26:11 2017 +0100
blkdeactive: use /sbin for mdamd
Do not using lvm's @SBINDIR@ for mdadm path.
Set this directly to /sbin/mdadm like other tools.
Group them separately
---
scripts/blkdeactivate.sh.in | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
index cfec0af..a4b8a8f 100644
--- a/scripts/blkdeactivate.sh.in
+++ b/scripts/blkdeactivate.sh.in
@@ -31,17 +31,17 @@ shopt -s dotglob nullglob
TOOL=blkdeactivate
-sbindir="@SBINDIR@"
-
DEV_DIR="/dev"
SYS_BLK_DIR="/sys/block"
+MDADM="/sbin/mdadm"
MOUNTPOINT="/bin/mountpoint"
+MPATHD="/sbin/multipathd"
UMOUNT="/bin/umount"
+
+sbindir="@SBINDIR@"
DMSETUP="$sbindir/dmsetup"
LVM="$sbindir/lvm"
-MDADM="$sbindir/mdadm"
-MPATHD="/sbin/multipathd"
if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
UMOUNT_OPTS="--all-targets "
6 years, 4 months
master - coverity: avoid overflow_before_widen
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2354fb3fe45c6e2739a...
Commit: 2354fb3fe45c6e2739a0a902f378c70c5422ac48
Parent: 56b527a6fbf6f886af4c78dd118867e4513c6a9c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Nov 5 18:24:15 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Nov 7 21:26:11 2017 +0100
coverity: avoid overflow_before_widen
TODO: it likely should be checked value is >0...
---
lib/metadata/raid_manip.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index f48169e..da00905 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1842,7 +1842,7 @@ static int _reshape_adjust_to_size(struct logical_volume *lv,
/* Externally visible LV size w/o reshape space */
lv->le_count = seg->len = new_le_count;
- lv->size = (uint64_t) (lv->le_count - new_image_count * _reshape_len_per_dev(seg)) * lv->vg->extent_size;
+ lv->size = (lv->le_count - (uint64_t) new_image_count * _reshape_len_per_dev(seg)) * lv->vg->extent_size;
/* seg->area_len does not change */
if (old_image_count < new_image_count) {
6 years, 4 months
master - coverity: avoid memleak
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=56b527a6fbf6f886af4...
Commit: 56b527a6fbf6f886af4c78dd118867e4513c6a9c
Parent: 14d0b0bbddb214fbb5dcacfb60d1723d87076bd9
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Nov 5 18:39:05 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Nov 7 21:26:09 2017 +0100
coverity: avoid memleak
When security_level was set, allocated filename was leaking.
---
WHATS_NEW | 1 +
tools/vgcfgbackup.c | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 94a7af6..0775d7b 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.177 -
====================================
+ Fix memleak of string buffer when vgcfgbackup runs in secure mode.
Do not print error when clvmd cannot find running clvmd.
Prevent start of new merge of snapshot if origin is already being merged.
diff --git a/tools/vgcfgbackup.c b/tools/vgcfgbackup.c
index 5d21131..814ed1d 100644
--- a/tools/vgcfgbackup.c
+++ b/tools/vgcfgbackup.c
@@ -20,8 +20,13 @@ static char *_expand_filename(const char *template, const char *vg_name,
{
char *filename;
- if (security_level())
- return dm_strdup(template);
+ if (security_level()) {
+ if (!(filename = dm_strdup(template))) {
+ log_error("Failed to allocate filename.");
+ return NULL;
+ }
+ goto out;
+ }
if (!(filename = dm_malloc(PATH_MAX))) {
log_error("Failed to allocate filename.");
@@ -31,7 +36,7 @@ static char *_expand_filename(const char *template, const char *vg_name,
if (dm_snprintf(filename, PATH_MAX, template, vg_name) < 0) {
log_error("Error processing filename template %s",
template);
- dm_free(filename);
+ dm_free(filename);
return NULL;
}
if (*last_filename && !strncmp(*last_filename, filename, PATH_MAX)) {
@@ -40,7 +45,7 @@ static char *_expand_filename(const char *template, const char *vg_name,
dm_free(filename);
return NULL;
}
-
+out:
dm_free(*last_filename);
*last_filename = filename;
6 years, 4 months
master - clvmd: supress ENOENT error on testing connection
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=14d0b0bbddb214fbb5d...
Commit: 14d0b0bbddb214fbb5dcacfb60d1723d87076bd9
Parent: 014122256b50b30324fc848fa79492124bebeb39
Author: Eric Ren <zren(a)suse.com>
AuthorDate: Mon Oct 30 20:53:20 2017 +0800
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Nov 7 21:24:39 2017 +0100
clvmd: supress ENOENT error on testing connection
In HA cluster, we have "clvm" resource agent to manage clvmd daemon.
The agent invokes clvmd like: "clvmd -T90 -d0", which always prints
a scaring error message:
"""
local socket: connect failed: No such file or directory
"""
When specifed with "-d" option, clvmd tries to check if an instance
of the clvmd daemon is already running through a testing connection.
The connect() will fail with this ENOENT error in such case, so supress
the error message in such case.
TODO: add missing error reaction code - since ofter log_error, program
is not supposed to continue running (log_error() is for reporting
stopping problems).
Signed-off-by: Eric Ren <zren(a)suse.com>
---
WHATS_NEW | 1 +
daemons/clvmd/clvmd.c | 14 +++++++++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index fdf2c3a..94a7af6 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.177 -
====================================
+ Do not print error when clvmd cannot find running clvmd.
Prevent start of new merge of snapshot if origin is already being merged.
Version 2.02.176 - 3rd November 2017
diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index 9dbda89..e15a40a 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -2151,6 +2151,14 @@ static int add_to_lvmqueue(struct local_client *client, struct clvm_header *msg,
}
/* Return 0 if we can talk to an existing clvmd */
+/*
+ * FIXME:
+ *
+ * This function returns only -1 or 0, but there are
+ * different levels of errors, some of them should stop
+ * further execution of clvmd thus another state is needed
+ * and some error message need to be only informational.
+ */
static int check_local_clvmd(void)
{
int local_socket;
@@ -2170,7 +2178,11 @@ static int check_local_clvmd(void)
if (connect(local_socket,(struct sockaddr *) &sockaddr,
sizeof(sockaddr))) {
- log_sys_error("connect", "local socket");
+ /* connection failure is expected state */
+ if (errno == ENOENT)
+ log_sys_debug("connect", "local socket");
+ else
+ log_sys_error("connect", "local socket");
ret = -1;
}
6 years, 4 months
master - snapshot: prevent repeated merging
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=014122256b50b30324f...
Commit: 014122256b50b30324fc848fa79492124bebeb39
Parent: 1b6dfd4802c136509ffb9d9927b6611265d59e6b
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Nov 4 22:15:59 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Nov 7 21:22:50 2017 +0100
snapshot: prevent repeated merging
Check and prevent starting another snapshot merge before
exiting merging is finished.
TODO: we can possibly implement smarter logic to drop existing
merging and start a new one.
---
WHATS_NEW | 1 +
tools/lvconvert.c | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 6b426e4..fdf2c3a 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.177 -
====================================
+ Prevent start of new merge of snapshot if origin is already being merged.
Version 2.02.176 - 3rd November 2017
====================================
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 3a025c7..438f34b 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -2008,6 +2008,15 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
struct lvinfo info;
dm_percent_t snap_percent;
+ /* Check if merge is possible */
+ if (lv_is_merging_origin(origin)) {
+ log_error("Cannot merge snapshot %s into the origin %s "
+ "with merging snapshot %s.",
+ display_lvname(lv), display_lvname(origin),
+ display_lvname(find_snapshot(origin)->lv));
+ return 0;
+ }
+
if (lv_is_external_origin(origin_from_cow(lv))) {
log_error("Cannot merge snapshot \"%s\" into "
"the read-only external origin \"%s\".",
6 years, 4 months
v2_02_176 annotated tag has been created
by Alasdair Kergon
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ba95d0d3ca858851098...
Commit: ba95d0d3ca8588510986bc35f9cded24b01819e3
Parent: 0000000000000000000000000000000000000000
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: 2017-11-03 02:29 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: 2017-11-03 02:29 +0000
annotated tag: v2_02_176 has been created
at ba95d0d3ca8588510986bc35f9cded24b01819e3 (tag)
tagging 29300e72eebe974d90ebd2b55925bd728f81a326 (commit)
replaces v2_02_175
Release 2.02.176.
Another assortment of small fixes.
121 files changed, 2955 insertions(+), 3395 deletions(-)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAln71MQACgkQIoGRwVZ+LBeSqwCfWdmUzoSlfa0BhH2D4qcUVzCO
za8AmQG0BERRK691O9u/jrBQUgb3101b
=Wl6C
-----END PGP SIGNATURE-----
Alasdair G Kergon (11):
post-release
man: regenerate
thin: Improve overprovisioning and repair warnings.
device: Separate errors for dev not found and filtered.
tidy: Add missing underscores to statics.
liblvm: Move lib code used exclusively into metadata-liblvm.c
dmsetup: Add unknown device error to dmsetup status.
vgsplit: Fix detection of moved PVs.
metadata: Avoid accessing ignored metadata.
liblvm: Fix segfault in lvm_pv_remove.
pre-release
Bastian Blank (1):
systemd: remove Install sections from socket-activated services
David Teigland (2):
replicator: remove the code
lvmlockd: check error for sanlock access to lvmlock LV
Heinz Mauelshagen (10):
raid: return previous reshape space allocation properly
raid: fix validation checks for segment data_offset member
lvcreate: fix region size on striped RaidLVs
raid: fix validation check for raid0 segment data_offset member
raid: cleanup raid4/5/6/10 validation check
lvcreate: allow 100%FREE creation of "--type mirror" to work
test: remove 'should's from test to test target status race fix
raid: ignore --stripes/--stripesize on takeover
lvcreate: error message with dot.
WHATS_NEW: ignore stripes/stripesize on RAID takover
Jonathan Brassow (5):
clean-up: Correct the comment to match the particular test case
test: clean-up failing test case and document 'should' cases
testsuite: Add and document a 'should' for "idle" -> "recover" RAID test
testsuite: Fix problem when checking RAID4/5/6 for mismatches.
testsuite: Forgot to pull 'should's after fixing RAID4/5/6 mismatch test
Marian Csontos (3):
test: "Disable" lvconvert-raid-reshape
Update WHATS_NEW
configure: autoreconf
Ondrej Kozina (13):
fsadm: add support for crypt devices
test: add fsadm crypt test
fsadm: minor fixes for crypt support
test: fsadm-crypt.sh fixes
fsadm: respect DM_DEV_DIR variable
fsadm: fail 'check' explicitly on unsupported fs type
fsadm: implement 'check' for a fs on top of LUKS
test: update fsadm-crypt to pass with legacy cryptsetup
fsadm: add luks specific error message for small devices
fsadm: fix bug in LUKS grow/shrink decision branch
test: add regression test for fsadm bug
fsadm: rename local variables to avoid confusion
fsadm: refactor resize_crypt function
Zdenek Kabelac (39):
activation: fix locking resource name for activation lock
activation: fix activation lock
thin: monitor also external origin
tests: check external origin is monitored
libdm: fix typo in libdevmapper.pc
lvconvert: preserve names of converted LV
lvextend: detect stacked cache lv used for thinpool
lvcreate: skip checking for name restriction for caching
tests: check stacked cache dataLV of thin-pool
lvconvert: fixing extraction of vgname
tests:check lvconvert with /dev in vglvname
snapshot: improve validation
typo: fix invalid
tests: snapshot conversions
configure: improve support for sbindir path
systemd: use proper sbindir path
scripts: paths update
shellcheck: some apostrophe changes and cleanups
commands: drop secondary for lvconvert --type snapshot
WHATS_NEW: missed
log: better message when reached log limit
Makefile: help shows hint about LVM_LOG_FILE_MAX_LINES
tests: allow override of LVM_LOG_FILE_MAX_LINES
tests: better clustering support
man: Makefiles with V=1 support
snapshot: relocate common code validation for snapshot origin
tests: update checked messages
pool: drop create spare on error path
thin: fix merging messages
devcache: track more udev errors
validation: capture store of LV without segment
lvreduce: check LV has segment
tests: load reiserfs
raid: setup LV size earlier
tests: revert commit change
pvmove: simplify name generation
lv_manip: hide layered LV temporarily
cleanup: pvmove messages
cleanup: use segtype_is_raid_with_meta
6 years, 4 months
master - post-release
by Alasdair Kergon
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1b6dfd4802c136509ff...
Commit: 1b6dfd4802c136509ffb9d9927b6611265d59e6b
Parent: 29300e72eebe974d90ebd2b55925bd728f81a326
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Fri Nov 3 04:42:54 2017 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Fri Nov 3 04:42:54 2017 +0000
post-release
---
VERSION | 2 +-
VERSION_DM | 2 +-
WHATS_NEW | 3 +++
WHATS_NEW_DM | 3 +++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/VERSION b/VERSION
index 933eaeb..282f6f9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.176(2)-git (2017-11-03)
+2.02.177(2)-git (2017-11-03)
diff --git a/VERSION_DM b/VERSION_DM
index bddf7fb..7aab7d6 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.145-git (2017-11-03)
+1.02.146-git (2017-11-03)
diff --git a/WHATS_NEW b/WHATS_NEW
index 3f71bdd..6b426e4 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,6 @@
+Version 2.02.177 -
+====================================
+
Version 2.02.176 - 3rd November 2017
====================================
Keep Install section only in lvm2-{lvmetad,lvmpolld}.socket systemd unit.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index bcb3229..71ccea7 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,3 +1,6 @@
+Version 1.02.146 -
+====================================
+
Version 1.02.145 - 3rd November 2017
====================================
Keep Install section only in dm-event.socket systemd unit.
6 years, 4 months
master - pre-release
by Alasdair Kergon
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=29300e72eebe974d90e...
Commit: 29300e72eebe974d90ebd2b55925bd728f81a326
Parent: 4129cf5090cd329dceee03df127d6d3644bbaa66
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Fri Nov 3 02:28:55 2017 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Fri Nov 3 02:28:55 2017 +0000
pre-release
---
VERSION | 2 +-
VERSION_DM | 2 +-
WHATS_NEW | 6 +++---
WHATS_NEW_DM | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VERSION b/VERSION
index e6f3580..933eaeb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.176(2)-git (2017-10-06)
+2.02.176(2)-git (2017-11-03)
diff --git a/VERSION_DM b/VERSION_DM
index cb4da47..bddf7fb 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.145-git (2017-10-06)
+1.02.145-git (2017-11-03)
diff --git a/WHATS_NEW b/WHATS_NEW
index ac4053a..3f71bdd 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,7 +1,7 @@
-Version 2.02.176 -
-===================================
+Version 2.02.176 - 3rd November 2017
+====================================
Keep Install section only in lvm2-{lvmetad,lvmpolld}.socket systemd unit.
- liblvm: Fix segfault in lvm_pv_remove. (2.02.173)
+ Fix segfault in lvm_pv_remove in liblvm. (2.02.173)
Do not allow storing VG metadata with LV without any segment.
Fix printed message when thin snapshot was already merged.
Remove created spare LV when creation of thin-pool failed.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 12cd7f8..bcb3229 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,5 @@
-Version 1.02.145 -
-===================================
+Version 1.02.145 - 3rd November 2017
+====================================
Keep Install section only in dm-event.socket systemd unit.
Issue a specific error with dmsetup status if device is unknown.
Fix RT_LIBS reference in generated libdevmapper.pc for pkg-config
6 years, 4 months
master - testsuite: Forgot to pull 'should's after fixing RAID4/5/6 mismatch test
by Jonathan Brassow
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4129cf5090cd329dcee...
Commit: 4129cf5090cd329dceee03df127d6d3644bbaa66
Parent: 9e8dec2f387d8eaf48195ef38ab7699d4a8385ed
Author: Jonathan Brassow <jbrassow(a)redhat.com>
AuthorDate: Thu Nov 2 10:25:46 2017 -0500
Committer: Jonathan Brassow <jbrassow(a)redhat.com>
CommitterDate: Thu Nov 2 10:25:46 2017 -0500
testsuite: Forgot to pull 'should's after fixing RAID4/5/6 mismatch test
Test will now fail rather than warn if conditions are not met.
---
test/shell/lvchange-raid.sh | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh
index 604b7f7..e6626d1 100644
--- a/test/shell/lvchange-raid.sh
+++ b/test/shell/lvchange-raid.sh
@@ -184,15 +184,8 @@ run_syncaction_check() {
# 'lvs' should show results
lvchange --syncaction check $vg/$lv
aux wait_for_sync $vg $lv
- # FIXME: this needs kernel fix in md-raid
- # currently let just this test to cause 'warning'
- if ! get lv_field $vg/$lv lv_attr -a | grep '.*m.$'; then
- dmsetup status | grep $vg
- # false
- fi
- # FIXME: with fixed kernel this should not fail
- # add 'wrapper' detecting kernel for this
- should not check lv_field $vg/$lv raid_mismatch_count "0"
+ check lv_attr_bit health $vg/$lv "m"
+ not check lv_field $vg/$lv raid_mismatch_count "0"
# "repair" will fix discrepancies
lvchange --syncaction repair $vg/$lv
@@ -202,7 +195,7 @@ run_syncaction_check() {
# 'lvs' should show results
lvchange --syncaction check $vg/$lv
aux wait_for_sync $vg $lv
- check lv_attr_bit health $vg/$lv "-" || check lv_attr_bit health $vg/$lv "m"
+ check lv_attr_bit health $vg/$lv "-"
check lv_field $vg/$lv raid_mismatch_count "0"
}
6 years, 4 months