From 9e68cb64f6660fe9e40c4ef75e1a891aa0804dbb Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Thu, 24 Oct 2024 11:18:18 -0500 Subject: [PATCH 01/16] Refactor: pacemaker-attrd: always add remoteness to attribute value XML ... even if false, for code consistency and simplicity --- daemons/attrd/attrd_attributes.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/daemons/attrd/attrd_attributes.c b/daemons/attrd/attrd_attributes.c index b3eda6e2f9..74301d678a 100644 --- a/daemons/attrd/attrd_attributes.c +++ b/daemons/attrd/attrd_attributes.c @@ -143,14 +143,13 @@ attrd_add_value_xml(xmlNode *parent, const attribute_t *a, crm_xml_add(xml, PCMK__XA_ATTR_SET, a->set_id); crm_xml_add(xml, PCMK__XA_ATTR_USER, a->user); pcmk__xe_add_node(xml, v->nodename, v->nodeid); - if (pcmk_is_set(v->flags, attrd_value_remote)) { - crm_xml_add_int(xml, PCMK__XA_ATTR_IS_REMOTE, 1); - } crm_xml_add(xml, PCMK__XA_ATTR_VALUE, v->current); crm_xml_add_int(xml, PCMK__XA_ATTR_DAMPENING, pcmk__timeout_ms2s(a->timeout_ms)); crm_xml_add_int(xml, PCMK__XA_ATTR_IS_PRIVATE, pcmk_is_set(a->flags, attrd_attr_is_private)); + crm_xml_add_int(xml, PCMK__XA_ATTR_IS_REMOTE, + pcmk_is_set(v->flags, attrd_value_remote)); crm_xml_add_int(xml, PCMK__XA_ATTRD_IS_FORCE_WRITE, force_write); return xml; -- 2.43.0