Proxmox-Port/libqb
1
0
Fork 0
mirror of https://salsa.debian.org/ha-team/libqb synced 2026-01-08 12:24:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make some logs less noisy (#495)

Browse Source 
* log: lower IPC connection issues to info level

... in handle_new_connection(). The caller has better context for whether a
problem merits a warning or error, and the function's return code is
sufficiently descriptive to do so. Some problems may be expected or able to be
worked around.

For example, Pacemaker's crm_mon attempts to contact pacemakerd IPC. On a
Pacemaker Remote node, that IPC will be unavailable, and crm_mon can check the
libqb return code to detect and handle that situation gracefully.

* log: lower some ringbuffer debug messages to trace level

They're rather noisy, with every shm-based IPC connection generating multiple
obscure messages like:

  debug: shm size:1048589; real_size:1052672; rb->word_size:263168

and every disconnect generating the rather unhelpful:

  debug: qb_ipcc_disconnect()

along with multiple messages like:

  debug: Closing ringbuffer: /dev/shm/qb-10986-11014-34-26VRvs/qb-request-cmap-header

All of these seem appropriate to trace level.
This commit is contained in:
Ken Gaillot 2024-01-31 03:44:16 -06:00 committed by GitHub
parent c7528139dc
commit 1070cbc17c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ipc_setup.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2013 Red Hat, Inc.
* Copyright 2010-2024 Red Hat, Inc.
*
* Author: Angus Salkeld <asalkeld@redhat.com>
*
@ -765,16 +765,15 @@ send_response:
qb_ipcs_connection_unref(c);
} else {
if (res == -EACCES) {
qb_util_log(LOG_ERR, "Invalid IPC credentials (%s).",
qb_util_log(LOG_INFO, "IPC connection credentials rejected (%s)",
c->description);
} else if (res == -EAGAIN) {
qb_util_log(LOG_WARNING, "Denied connection, is not ready (%s)",
qb_util_log(LOG_INFO, "IPC connection not ready (%s)",
c->description);
} else {
errno = -res;
qb_util_perror(LOG_ERR,
"Error in connection setup (%s)",
qb_util_perror(LOG_INFO, "IPC connection setup failed (%s)",
c->description);
errno = -res;
}
if (c->state == QB_IPCS_CONNECTION_INACTIVE) {

4
lib/ipcc.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010 Red Hat, Inc.
* Copyright 2010-2024 Red Hat, Inc.
*
* Author: Angus Salkeld <asalkeld@redhat.com>
*
@ -480,7 +480,7 @@ qb_ipcc_disconnect(struct qb_ipcc_connection *c)
{
struct qb_ipc_one_way *ow = NULL;
qb_util_log(LOG_DEBUG, "%s()", __func__);
qb_util_log(LOG_TRACE, "%s(%s)", __func__, (c == NULL)? "NULL" : "");
if (c == NULL) {
return;

4
lib/ringbuffer.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright 2010-2024 Red Hat, Inc.
*
* Author: Angus Salkeld <asalkeld@redhat.com>
*
@ -233,7 +233,7 @@ qb_rb_open_2(const char *name, size_t size, uint32_t flags,
goto cleanup_hdr;
}
qb_util_log(LOG_DEBUG,
qb_util_log(LOG_TRACE,
"shm size:%ld; real_size:%ld; rb->word_size:%d", size,
real_size, rb->shared_hdr->word_size);

4
lib/ringbuffer_helper.c
View File

@ -334,12 +334,12 @@ qb_rb_close_helper(struct qb_ringbuffer_s * rb, int32_t unlink_it,
char *hdr_path = rb->shared_hdr->hdr_path;
if (unlink_it) {
qb_util_log(LOG_DEBUG, "Free'ing ringbuffer: %s", hdr_path);
qb_util_log(LOG_TRACE, "Free'ing ringbuffer: %s", hdr_path);
if (rb->notifier.destroy_fn) {
(void)rb->notifier.destroy_fn(rb->notifier.instance);
}
} else {
qb_util_log(LOG_DEBUG, "Closing ringbuffer: %s", hdr_path);
qb_util_log(LOG_TRACE, "Closing ringbuffer: %s", hdr_path);
hdr_path = NULL;
}