File pacemaker-libcrmcommon-improve-connection-loss-message.patch of Package pacemaker.12602
commit dbadf30000ee466cd4e27f22531f8c6f26b8f6a2
Author: Ken Gaillot <kgaillot@redhat.com>
Date: Sat Apr 28 09:52:33 2018 -0500
Log: libcrmcommon: improve connection loss message
diff --git a/cts/patterns.py b/cts/patterns.py
index 8f0388a78..ea1dd94ba 100644
--- a/cts/patterns.py
+++ b/cts/patterns.py
@@ -145,9 +145,8 @@ class crm_corosync(BasePatterns):
r"Parse error: Ignoring unknown option .*nodename",
r"error.*: Operation 'reboot' .* with device 'FencingFail' returned:",
r"getinfo response error: 1$",
- "sbd.* error: inquisitor_child: DEBUG MODE IS ACTIVE",
- r"sbd.* pcmk:\s*error:.*Connection to cib_ro failed",
- r"sbd.* pcmk:\s*error:.*Connection to cib_ro.* closed .I/O condition=17",
+ r"sbd.* error: inquisitor_child: DEBUG MODE IS ACTIVE",
+ r"sbd.* pcmk:\s*error:.*Connection to cib_ro.* (failed|closed)",
]
self.BadNews = [
diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c
index ce9f0ec3d..3627ca19e 100644
--- a/lib/common/mainloop.c
+++ b/lib/common/mainloop.c
@@ -674,7 +674,8 @@ mainloop_gio_callback(GIOChannel * gio, GIOCondition condition, gpointer data)
}
if (client->ipc && crm_ipc_connected(client->ipc) == FALSE) {
- crm_err("Connection to %s[%p] closed (I/O condition=%d)", client->name, client, condition);
+ crm_err("Connection to %s closed " CRM_XS "client=%p condition=%d",
+ client->name, client, condition);
keep = FALSE;
} else if (condition & (G_IO_HUP | G_IO_NVAL | G_IO_ERR)) {