|
 |
60de42 |
From 0abcd469f5ee43bc908922e6994d80107d6ac462 Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
60de42 |
Date: Fri, 9 Jun 2017 11:11:12 -0500
|
|
|
60de42 |
Subject: [PATCH] Refactor: libcrmcommon: rename queue backlog structure member
|
|
|
60de42 |
|
|
|
60de42 |
will be more consistent with future changes
|
|
|
60de42 |
---
|
|
|
60de42 |
include/crm/common/ipcs.h | 2 +-
|
|
|
60de42 |
lib/common/ipc.c | 8 ++++----
|
|
|
60de42 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/include/crm/common/ipcs.h b/include/crm/common/ipcs.h
|
|
|
60de42 |
index 06cade9..52338e3 100644
|
|
|
60de42 |
--- a/include/crm/common/ipcs.h
|
|
|
60de42 |
+++ b/include/crm/common/ipcs.h
|
|
|
60de42 |
@@ -93,7 +93,7 @@ struct crm_client_s {
|
|
|
60de42 |
|
|
|
60de42 |
struct crm_remote_s *remote; /* TCP/TLS */
|
|
|
60de42 |
|
|
|
60de42 |
- unsigned int backlog_len; /* IPC queue length after last flush */
|
|
|
60de42 |
+ unsigned int queue_backlog; /* IPC queue length after last flush */
|
|
|
60de42 |
};
|
|
|
60de42 |
|
|
|
60de42 |
extern GHashTable *client_connections;
|
|
|
60de42 |
diff --git a/lib/common/ipc.c b/lib/common/ipc.c
|
|
|
60de42 |
index efe6480..50980ec 100644
|
|
|
60de42 |
--- a/lib/common/ipc.c
|
|
|
60de42 |
+++ b/lib/common/ipc.c
|
|
|
60de42 |
@@ -558,25 +558,25 @@ crm_ipcs_flush_events(crm_client_t * c)
|
|
|
60de42 |
*/
|
|
|
60de42 |
|
|
|
60de42 |
if (queue_len > PCMK_IPC_MAX_QUEUE) {
|
|
|
60de42 |
- if ((c->backlog_len <= 1) || (queue_len < c->backlog_len)) {
|
|
|
60de42 |
+ if ((c->queue_backlog <= 1) || (queue_len < c->queue_backlog)) {
|
|
|
60de42 |
/* Don't evict for a new or shrinking backlog */
|
|
|
60de42 |
crm_warn("Client with process ID %u has a backlog of %u messages "
|
|
|
60de42 |
CRM_XS " %p", c->pid, queue_len, c->ipcs);
|
|
|
60de42 |
} else {
|
|
|
60de42 |
crm_err("Evicting client with process ID %u due to backlog of %u messages "
|
|
|
60de42 |
CRM_XS " %p", c->pid, queue_len, c->ipcs);
|
|
|
60de42 |
- c->backlog_len = 0;
|
|
|
60de42 |
+ c->queue_backlog = 0;
|
|
|
60de42 |
qb_ipcs_disconnect(c->ipcs);
|
|
|
60de42 |
return rc;
|
|
|
60de42 |
}
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
- c->backlog_len = queue_len;
|
|
|
60de42 |
+ c->queue_backlog = queue_len;
|
|
|
60de42 |
delay_next_flush(c, queue_len);
|
|
|
60de42 |
|
|
|
60de42 |
} else {
|
|
|
60de42 |
/* Event queue is empty, there is no backlog */
|
|
|
60de42 |
- c->backlog_len = 0;
|
|
|
60de42 |
+ c->queue_backlog = 0;
|
|
|
60de42 |
}
|
|
|
60de42 |
|
|
|
60de42 |
return rc;
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|