Fix: crmd: attribute write-out not needed with atomic attrd

Ken Gaillot · Ken Gaillot · commit fe44f400a311 · 2017-05-25T12:46:38.000-05:00
This is a scalability issue, as the write-out results in CIB notifications
for each attribute/node combination, which can overwhelm the crmd and
get it evicted from the cib as a slow IPC client.
diff --git a/crmd/join_client.c b/crmd/join_client.c
@@ -313,7 +313,13 @@ do_cl_join_finalize_respond(long long action,
 
         if (AM_I_DC == FALSE) {
             register_fsa_input_adv(cause, I_NOT_DC, NULL, A_NOTHING, TRUE, __FUNCTION__);
+#if !HAVE_ATOMIC_ATTRD
+            /* Ask attrd to write all attributes to disk. This is not needed for
+             * atomic attrd because atomic attrd does a peer sync and write-out
+             * when winning an election.
+             */
             update_attrd(NULL, NULL, NULL, NULL, FALSE);
+#endif
         }
 
         free_xml(tmp1);
diff --git a/crmd/join_dc.c b/crmd/join_dc.c
@@ -686,7 +686,13 @@ do_dc_join_final(long long action,
                  enum crmd_fsa_input current_input, fsa_data_t * msg_data)
 {
     crm_debug("Ensuring DC, quorum and node attributes are up-to-date");
+#if !HAVE_ATOMIC_ATTRD
+    /* Ask attrd to write all attributes to disk. This is not needed for
+     * atomic attrd because atomic attrd does a peer sync and write-out
+     * when winning an election.
+     */
     update_attrd(NULL, NULL, NULL, NULL, FALSE);
+#endif
     crm_update_quorum(crm_have_quorum, TRUE);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,13 @@ do_dc_join_final(long long action,`
`686`	`686`	`enum crmd_fsa_input current_input, fsa_data_t * msg_data)`
`687`	`687`	`{`
`688`	`688`	`crm_debug("Ensuring DC, quorum and node attributes are up-to-date");`
	`689`	`+#if !HAVE_ATOMIC_ATTRD`
	`690`	`+ /* Ask attrd to write all attributes to disk. This is not needed for`
	`691`	`+ * atomic attrd because atomic attrd does a peer sync and write-out`
	`692`	`+ * when winning an election.`
	`693`	`+ */`
`689`	`694`	`update_attrd(NULL, NULL, NULL, NULL, FALSE);`
	`695`	`+#endif`
`690`	`696`	`crm_update_quorum(crm_have_quorum, TRUE);`
`691`	`697`	`}`
`692`	`698`