|
 |
37a2d7 |
From b5b06ccf564cd339b91526c13be1dd86d06c1a93 Mon Sep 17 00:00:00 2001
|
|
|
37a2d7 |
From: David Teigland <teigland@redhat.com>
|
|
|
37a2d7 |
Date: Mon, 13 Apr 2015 11:00:40 -0500
|
|
|
37a2d7 |
Subject: [PATCH 10/10] dlm_controld: don't log error from cpg_dispatch
|
|
|
37a2d7 |
|
|
|
37a2d7 |
These errors from cpg_dispatch are expected.
|
|
|
37a2d7 |
|
|
|
37a2d7 |
Signed-off-by: David Teigland <teigland@redhat.com>
|
|
|
37a2d7 |
---
|
|
|
37a2d7 |
dlm_controld/cpg.c | 2 +-
|
|
|
37a2d7 |
dlm_controld/daemon_cpg.c | 4 ++--
|
|
|
37a2d7 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
37a2d7 |
|
|
|
37a2d7 |
diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c
|
|
|
37a2d7 |
index f97115835987..b23a008e1996 100644
|
|
|
37a2d7 |
--- a/dlm_controld/cpg.c
|
|
|
37a2d7 |
+++ b/dlm_controld/cpg.c
|
|
|
37a2d7 |
@@ -1664,7 +1664,7 @@ static void process_cpg_lockspace(int ci)
|
|
|
37a2d7 |
}
|
|
|
37a2d7 |
|
|
|
37a2d7 |
error = cpg_dispatch(ls->cpg_handle, CS_DISPATCH_ALL);
|
|
|
37a2d7 |
- if (error != CS_OK) {
|
|
|
37a2d7 |
+ if (error != CS_OK && error != CS_ERR_BAD_HANDLE) {
|
|
|
37a2d7 |
log_error("cpg_dispatch error %d", error);
|
|
|
37a2d7 |
return;
|
|
|
37a2d7 |
}
|
|
|
37a2d7 |
diff --git a/dlm_controld/daemon_cpg.c b/dlm_controld/daemon_cpg.c
|
|
|
37a2d7 |
index d88cd467f03a..356e80ddfc67 100644
|
|
|
37a2d7 |
--- a/dlm_controld/daemon_cpg.c
|
|
|
37a2d7 |
+++ b/dlm_controld/daemon_cpg.c
|
|
|
37a2d7 |
@@ -1871,7 +1871,7 @@ int set_protocol(void)
|
|
|
37a2d7 |
*/
|
|
|
37a2d7 |
|
|
|
37a2d7 |
error = cpg_dispatch(cpg_handle_daemon, CS_DISPATCH_ONE);
|
|
|
37a2d7 |
- if (error != CS_OK)
|
|
|
37a2d7 |
+ if (error != CS_OK && error != CS_ERR_BAD_HANDLE)
|
|
|
37a2d7 |
log_error("daemon cpg_dispatch one error %d", error);
|
|
|
37a2d7 |
}
|
|
|
37a2d7 |
if (pollfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
|
|
|
37a2d7 |
@@ -2181,7 +2181,7 @@ void process_cpg_daemon(int ci)
|
|
|
37a2d7 |
cs_error_t error;
|
|
|
37a2d7 |
|
|
|
37a2d7 |
error = cpg_dispatch(cpg_handle_daemon, CS_DISPATCH_ALL);
|
|
|
37a2d7 |
- if (error != CS_OK)
|
|
|
37a2d7 |
+ if (error != CS_OK && error != CS_ERR_BAD_HANDLE)
|
|
|
37a2d7 |
log_error("daemon cpg_dispatch error %d", error);
|
|
|
37a2d7 |
}
|
|
|
37a2d7 |
|
|
|
37a2d7 |
--
|
|
|
37a2d7 |
1.8.3.1
|
|
|
37a2d7 |
|