Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=14d0b0bbddb214fbb5dca…
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;
}
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ba95d0d3ca8588510986b…
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
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4129cf5090cd329dceee0…
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"
}