|
 |
3d71c6 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
3d71c6 |
Date: Thu, 27 Aug 2015 11:00:02 -0500
|
|
|
3d71c6 |
Subject: [PATCH] Fix: crmd: don't add node ID to proxied remote node requests
|
|
|
3d71c6 |
for attrd
|
|
|
3d71c6 |
|
|
|
3d71c6 |
446a1005 incorrectly set F_ATTRD_HOST_ID for proxied remote node requests to
|
|
|
3d71c6 |
attrd. Since attrd only uses F_ATTRD_HOST_ID to associate a cluster node name
|
|
|
3d71c6 |
with an ID, it doesn't ever need to be set for remote nodes.
|
|
|
3d71c6 |
|
|
|
3d71c6 |
Additionally, that revision used the proxying cluster node's node ID, which can
|
|
|
3d71c6 |
lead to node ID conflicts in attrd.
|
|
|
3d71c6 |
|
|
|
3d71c6 |
(cherry picked from commit 6af6da534646dbadf3d8d1d63d0edb2844c72073)
|
|
|
3d71c6 |
---
|
|
|
3d71c6 |
crmd/lrm_state.c | 1 -
|
|
|
3d71c6 |
1 file changed, 1 deletion(-)
|
|
|
3d71c6 |
|
|
|
3d71c6 |
diff --git a/crmd/lrm_state.c b/crmd/lrm_state.c
|
|
|
3d71c6 |
index c03fa0b..bea1027 100644
|
|
|
3d71c6 |
--- a/crmd/lrm_state.c
|
|
|
3d71c6 |
+++ b/crmd/lrm_state.c
|
|
|
3d71c6 |
@@ -540,7 +540,6 @@ remote_proxy_cb(lrmd_t *lrmd, void *userdata, xmlNode *msg)
|
|
|
3d71c6 |
if (safe_str_eq(type, T_ATTRD)
|
|
|
3d71c6 |
&& crm_element_value(request, F_ATTRD_HOST) == NULL) {
|
|
|
3d71c6 |
crm_xml_add(request, F_ATTRD_HOST, proxy->node_name);
|
|
|
3d71c6 |
- crm_xml_add_int(request, F_ATTRD_HOST_ID, get_local_nodeid(0));
|
|
|
3d71c6 |
}
|
|
|
3d71c6 |
|
|
|
3d71c6 |
rc = crm_ipc_send(proxy->ipc, request, flags, 5000, NULL);
|