diff --git a/SOURCES/0010-dlm_controld-don-t-log-error-from-cpg_dispatch.patch b/SOURCES/0010-dlm_controld-don-t-log-error-from-cpg_dispatch.patch new file mode 100644 index 0000000..e0175fc --- /dev/null +++ b/SOURCES/0010-dlm_controld-don-t-log-error-from-cpg_dispatch.patch @@ -0,0 +1,51 @@ +From b5b06ccf564cd339b91526c13be1dd86d06c1a93 Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Mon, 13 Apr 2015 11:00:40 -0500 +Subject: [PATCH 10/10] dlm_controld: don't log error from cpg_dispatch + +These errors from cpg_dispatch are expected. + +Signed-off-by: David Teigland +--- + dlm_controld/cpg.c | 2 +- + dlm_controld/daemon_cpg.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c +index f97115835987..b23a008e1996 100644 +--- a/dlm_controld/cpg.c ++++ b/dlm_controld/cpg.c +@@ -1664,7 +1664,7 @@ static void process_cpg_lockspace(int ci) + } + + error = cpg_dispatch(ls->cpg_handle, CS_DISPATCH_ALL); +- if (error != CS_OK) { ++ if (error != CS_OK && error != CS_ERR_BAD_HANDLE) { + log_error("cpg_dispatch error %d", error); + return; + } +diff --git a/dlm_controld/daemon_cpg.c b/dlm_controld/daemon_cpg.c +index d88cd467f03a..356e80ddfc67 100644 +--- a/dlm_controld/daemon_cpg.c ++++ b/dlm_controld/daemon_cpg.c +@@ -1871,7 +1871,7 @@ int set_protocol(void) + */ + + error = cpg_dispatch(cpg_handle_daemon, CS_DISPATCH_ONE); +- if (error != CS_OK) ++ if (error != CS_OK && error != CS_ERR_BAD_HANDLE) + log_error("daemon cpg_dispatch one error %d", error); + } + if (pollfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { +@@ -2181,7 +2181,7 @@ void process_cpg_daemon(int ci) + cs_error_t error; + + error = cpg_dispatch(cpg_handle_daemon, CS_DISPATCH_ALL); +- if (error != CS_OK) ++ if (error != CS_OK && error != CS_ERR_BAD_HANDLE) + log_error("daemon cpg_dispatch error %d", error); + } + +-- +1.8.3.1 + diff --git a/SPECS/dlm.spec b/SPECS/dlm.spec index 4aab87d..d1d1d6d 100644 --- a/SPECS/dlm.spec +++ b/SPECS/dlm.spec @@ -1,6 +1,6 @@ Name: dlm Version: 4.0.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ # For a breakdown of the licensing, see README.license Group: System Environment/Kernel @@ -19,6 +19,7 @@ Patch1: 0002-dlm_stonith-install-man-page.patch Patch2: 0003-libdlm-udev-dir-now-under-usr-lib.patch Patch3: 0005-dlm_tool-fix-status-printing-in-libdlmcontrol.patch Patch4: 0008-dlm-clear-out-addrs-before-calling-into-corosync_cft.patch +Patch5: 0010-dlm_controld-don-t-log-error-from-cpg_dispatch.patch %if 0%{?rhel} ExclusiveArch: i686 x86_64 s390x @@ -43,6 +44,7 @@ The kernel dlm requires a user daemon to control membership. %patch2 -p1 -b .0003-libdlm-udev-dir-now-under-usr-lib.patch %patch3 -p1 -b .0005-dlm_tool-fix-status-printing-in-libdlmcontrol.patch %patch4 -p1 -b .0008-dlm-clear-out-addrs-before-calling-into-corosync_cft.patch +%patch5 -p1 -b .0010-dlm_controld-don-t-log-error-from-cpg_dispatch.patch %build # upstream does not require configure @@ -114,6 +116,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jul 06 2015 David Teigland - 4.0.2-6 +- dlm_controld: don't log error from cpg_dispatch + * Mon Nov 17 2014 David Teigland - 4.0.2-5 - dlm_tool: fix status printing in libdlmcontrol