diff --git a/daemons/controld/controld_attrd.c b/daemons/controld/controld_attrd.c
index 0ce8be8bf8..06538041cb 100644
--- a/daemons/controld/controld_attrd.c
+++ b/daemons/controld/controld_attrd.c
@@ -1,160 +1,173 @@
/*
* Copyright 2006-2018 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 <crm/crm.h>
#include <crm/attrd.h>
#include <crm/msg_xml.h>
#include <controld_fsa.h>
#include <controld_utils.h>
#include <controld_messages.h>
crm_ipc_t *attrd_ipc = NULL;
static void
log_attrd_error(const char *host, const char *name, const char *value,
gboolean is_remote, char command, int rc)
{
const char *node_type = (is_remote? "Pacemaker Remote" : "cluster");
gboolean shutting_down = is_set(fsa_input_register, R_SHUTDOWN);
const char *when = (shutting_down? " at shutdown" : "");
switch (command) {
case 0:
crm_err("Could not clear failure attributes for %s on %s node %s%s: %s "
CRM_XS " rc=%d", (name? name : "all resources"), node_type,
host, when, pcmk_strerror(rc), rc);
break;
case 'C':
crm_err("Could not purge %s node %s in attribute manager%s: %s "
CRM_XS " rc=%d",
node_type, host, when, pcmk_strerror(rc), rc);
break;
case 'U':
/* We weren't able to update an attribute after several retries,
* so something is horribly wrong with the attribute manager or the
* underlying system.
*/
do_crm_log(AM_I_DC? LOG_CRIT : LOG_ERR,
"Could not update attribute %s=%s for %s node %s%s: %s "
CRM_XS " rc=%d", name, value, node_type, host, when,
pcmk_strerror(rc), rc);
if (AM_I_DC) {
/* We are unable to provide accurate information to the
* scheduler, so allow another node to take over DC.
* @TODO Should we do this unconditionally on any failure?
*/
crmd_exit(CRM_EX_FATAL);
} else if (shutting_down) {
// Fast-track shutdown since unable to request via attribute
register_fsa_input(C_FSA_INTERNAL, I_FAIL, NULL);
}
break;
}
}
static void
update_attrd_helper(const char *host, const char *name, const char *value,
const char *interval_spec, const char *user_name,
gboolean is_remote_node, char command)
{
int rc;
int attrd_opts = attrd_opt_none;
if (is_remote_node) {
attrd_opts |= attrd_opt_remote;
}
if (attrd_ipc == NULL) {
attrd_ipc = crm_ipc_new(T_ATTRD, 0);
}
for (int attempt = 1; attempt <= 4; ++attempt) {
+ rc = pcmk_ok;
+
+ // If we're not already connected, try to connect
if (crm_ipc_connected(attrd_ipc) == FALSE) {
- crm_ipc_close(attrd_ipc);
- crm_info("Connecting to attribute manager (attempt %d of 4)",
- attempt);
+ if (attempt == 1) {
+ // Start with a clean slate
+ crm_ipc_close(attrd_ipc);
+ }
if (crm_ipc_connect(attrd_ipc) == FALSE) {
- crm_perror(LOG_INFO, "Connection to attribute manager failed");
+ rc = errno;
}
+ crm_debug("Attribute manager connection attempt %d of 4: %s (%d)",
+ attempt, pcmk_strerror(rc), rc);
}
- if (command) {
- rc = attrd_update_delegate(attrd_ipc, command, host, name, value,
+ if (rc == pcmk_ok) {
+ rc = command?
+ attrd_update_delegate(attrd_ipc, command, host, name, value,
XML_CIB_TAG_STATUS, NULL, NULL,
- user_name, attrd_opts);
- } else {
- /* (ab)using name/value as resource/operation */
- rc = attrd_clear_delegate(attrd_ipc, host, name, value,
- interval_spec, user_name, attrd_opts);
+ user_name, attrd_opts)
+
+ /* No command means clear fail count (name/value is really
+ * resource/operation)
+ */
+ : attrd_clear_delegate(attrd_ipc, host, name, value,
+ interval_spec, user_name, attrd_opts);
+ crm_debug("Attribute manager request attempt %d of 4: %s (%d)",
+ attempt, pcmk_strerror(rc), rc);
}
if (rc == pcmk_ok) {
+ // Success, we're done
break;
- } else if (rc != -EAGAIN && rc != -EALREADY) {
- crm_info("Disconnecting from attribute manager: %s (%d)",
- pcmk_strerror(rc), rc);
+ } else if ((rc != EAGAIN) && (rc != EALREADY)) {
+ /* EAGAIN or EALREADY indicates a temporary block, so just try
+ * again. Otherwise, close the connection for a clean slate.
+ */
crm_ipc_close(attrd_ipc);
}
/* @TODO If the attribute manager remains unavailable the entire time,
* this function takes more than 6 seconds. Maybe set a timer for
* retries, to let the main loop do other work.
*/
if (attempt < 4) {
sleep(attempt);
}
}
if (rc != pcmk_ok) {
log_attrd_error(host, name, value, is_remote_node, command, rc);
}
}
void
update_attrd(const char *host, const char *name, const char *value,
const char *user_name, gboolean is_remote_node)
{
update_attrd_helper(host, name, value, NULL, user_name, is_remote_node,
'U');
}
void
update_attrd_remote_node_removed(const char *host, const char *user_name)
{
crm_trace("Asking attribute manager to purge Pacemaker Remote node %s",
host);
update_attrd_helper(host, NULL, NULL, NULL, user_name, TRUE, 'C');
}
void
update_attrd_clear_failures(const char *host, const char *rsc, const char *op,
const char *interval_spec, gboolean is_remote_node)
{
const char *op_desc = NULL;
const char *interval_desc = NULL;
const char *node_type = is_remote_node? "Pacemaker Remote" : "cluster";
if (op) {
interval_desc = interval_spec? interval_spec : "nonrecurring";
op_desc = op;
} else {
interval_desc = "all";
op_desc = "operations";
}
crm_info("Asking pacemaker-attrd to clear failure of %s %s for %s on %s node %s",
interval_desc, op_desc, rsc, node_type, host);
update_attrd_helper(host, rsc, op, interval_spec, NULL, is_remote_node, 0);
}