Page MenuHomeClusterLabs Projects

No OneTemporary

diff --git a/lrmd/lrmd_alert_api.c b/lrmd/lrmd_alert_api.c
index c5e052f56b..854b6ae40a 100644
--- a/lrmd/lrmd_alert_api.c
+++ b/lrmd/lrmd_alert_api.c
@@ -1,182 +1,186 @@
/*
* Copyright (C) 2016-2017 Andrew Beekhof <andrew@beekhof.net>
*
* This source code is licensed under the GNU General Public License version 2
* or later (GPLv2+) WITHOUT ANY WARRANTY.
*/
#include <crm_internal.h>
#include <glib.h>
#include <crm/crm.h>
#include <crm/services.h>
#include <crm/common/ipc.h>
#include <crm/common/ipcs.h>
#include <crm/common/alerts_internal.h>
#include <crm/msg_xml.h>
#include <lrmd_private.h>
/* Track in-flight alerts so we can wait for them at shutdown */
static GHashTable *inflight_alerts; /* key = call_id, value = timeout */
static gboolean draining_alerts = FALSE;
static inline void
add_inflight_alert(int call_id, int timeout)
{
if (inflight_alerts == NULL) {
inflight_alerts = g_hash_table_new(g_direct_hash, g_direct_equal);
}
g_hash_table_insert(inflight_alerts, GINT_TO_POINTER(call_id),
GINT_TO_POINTER(timeout));
}
static inline void
remove_inflight_alert(int call_id)
{
if (inflight_alerts != NULL) {
g_hash_table_remove(inflight_alerts, GINT_TO_POINTER(call_id));
}
}
static int
max_inflight_timeout()
{
GHashTableIter iter;
gpointer timeout;
int max_timeout = 0;
if (inflight_alerts) {
g_hash_table_iter_init(&iter, inflight_alerts);
while (g_hash_table_iter_next(&iter, NULL, &timeout)) {
if (GPOINTER_TO_INT(timeout) > max_timeout) {
max_timeout = GPOINTER_TO_INT(timeout);
}
}
}
return max_timeout;
}
struct alert_cb_s {
char *client_id;
int call_id;
};
static void
alert_complete(svc_action_t *action)
{
struct alert_cb_s *cb_data = (struct alert_cb_s *) (action->cb_data);
remove_inflight_alert(cb_data->call_id);
crm_debug("Alert pid %d for %s completed with rc=%d",
action->pid, cb_data->client_id, action->rc);
free(cb_data->client_id);
free(action->cb_data);
action->cb_data = NULL;
}
int
process_lrmd_alert_exec(crm_client_t *client, uint32_t id, xmlNode *request)
{
static int alert_sequence_no = 0;
xmlNode *alert_xml = get_xpath_object("//" F_LRMD_ALERT, request, LOG_ERR);
const char *alert_id = crm_element_value(alert_xml, F_LRMD_ALERT_ID);
const char *alert_path = crm_element_value(alert_xml, F_LRMD_ALERT_PATH);
svc_action_t *action = NULL;
int alert_timeout = 0;
int rc = pcmk_ok;
GHashTable *params = NULL;
struct alert_cb_s *cb_data = NULL;
if ((alert_id == NULL) || (alert_path == NULL)) {
return -EINVAL;
}
if (draining_alerts) {
return pcmk_ok;
}
crm_element_value_int(alert_xml, F_LRMD_TIMEOUT, &alert_timeout);
crm_info("Executing alert %s for %s", alert_id, client->id);
params = xml2list(alert_xml);
crm_insert_alert_key_int(params, CRM_alert_node_sequence,
++alert_sequence_no);
cb_data = calloc(1, sizeof(struct alert_cb_s));
CRM_CHECK(cb_data != NULL,
rc = -ENOMEM; goto err);
cb_data->client_id = strdup(client->id);
CRM_CHECK(cb_data->client_id != NULL,
rc = -ENOMEM; goto err);
crm_element_value_int(request, F_LRMD_CALLID, &(cb_data->call_id));
action = services_alert_create(alert_id, alert_path, alert_timeout, params,
alert_sequence_no, cb_data);
+ rc = services_action_user(action, CRM_DAEMON_USER);
+ if (rc < 0) {
+ goto err;
+ }
add_inflight_alert(cb_data->call_id, alert_timeout);
if (services_alert_async(action, alert_complete) == FALSE) {
services_action_free(action);
}
return pcmk_ok;
err:
if (cb_data) {
if (cb_data->client_id) {
free(cb_data->client_id);
}
free(cb_data);
}
if (action) {
services_action_free(action);
}
return rc;
}
static gboolean
alert_drain_timeout_callback(gpointer user_data)
{
gboolean *timeout_popped = (gboolean *) user_data;
*timeout_popped = TRUE;
return FALSE;
}
void
lrmd_drain_alerts(GMainContext *ctx)
{
guint timer, count;
gboolean timeout_popped = FALSE;
int timer_ms;
draining_alerts = TRUE;
if (inflight_alerts == NULL) {
return;
}
timer_ms = max_inflight_timeout() + 5000;
timer = g_timeout_add(timer_ms, alert_drain_timeout_callback,
(gpointer) &timeout_popped);
while (!timeout_popped) {
count = g_hash_table_size(inflight_alerts);
if (count == 0) {
break;
}
crm_trace("Draining mainloop while still %d alerts are in flight (timeout=%dms)",
count, timer_ms);
g_main_context_iteration(ctx, TRUE);
}
if (!timeout_popped && (timer > 0)) {
g_source_remove(timer);
}
g_hash_table_destroy(inflight_alerts);
inflight_alerts = NULL;
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jan 25, 11:09 AM (1 d, 7 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1322284
Default Alt Text
(5 KB)

Event Timeline