|
|
ed4e54 |
From 6df10102c02f93890c1994136b3ce6a60b33a05e Mon Sep 17 00:00:00 2001
|
|
|
ed4e54 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
ed4e54 |
Date: Mon, 6 Jan 2020 11:01:38 -0600
|
|
|
ed4e54 |
Subject: [PATCH] Refactor: controller: remove unused function arguments
|
|
|
ed4e54 |
|
|
|
ed4e54 |
... and rename affected functions
|
|
|
ed4e54 |
---
|
|
|
ed4e54 |
daemons/controld/controld_execd.c | 2 +-
|
|
|
ed4e54 |
daemons/controld/controld_fsa.c | 1 -
|
|
|
ed4e54 |
daemons/controld/controld_fsa.h | 4 ++--
|
|
|
ed4e54 |
daemons/controld/controld_join_client.c | 4 ++--
|
|
|
ed4e54 |
daemons/controld/controld_join_dc.c | 32 ++++++++++++++------------------
|
|
|
ed4e54 |
5 files changed, 19 insertions(+), 24 deletions(-)
|
|
|
ed4e54 |
|
|
|
ed4e54 |
diff --git a/daemons/controld/controld_execd.c b/daemons/controld/controld_execd.c
|
|
|
ed4e54 |
index f068413..16751b9 100644
|
|
|
ed4e54 |
--- a/daemons/controld/controld_execd.c
|
|
|
ed4e54 |
+++ b/daemons/controld/controld_execd.c
|
|
|
ed4e54 |
@@ -839,7 +839,7 @@ do_lrm_query_internal(lrm_state_t *lrm_state, int update_flags)
|
|
|
ed4e54 |
}
|
|
|
ed4e54 |
|
|
|
ed4e54 |
xmlNode *
|
|
|
ed4e54 |
-do_lrm_query(gboolean is_replace, const char *node_name)
|
|
|
ed4e54 |
+controld_query_executor_state(const char *node_name)
|
|
|
ed4e54 |
{
|
|
|
ed4e54 |
lrm_state_t *lrm_state = lrm_state_find(node_name);
|
|
|
ed4e54 |
|
|
|
ed4e54 |
diff --git a/daemons/controld/controld_fsa.c b/daemons/controld/controld_fsa.c
|
|
|
ed4e54 |
index bd732bc..db2b3f3 100644
|
|
|
ed4e54 |
--- a/daemons/controld/controld_fsa.c
|
|
|
ed4e54 |
+++ b/daemons/controld/controld_fsa.c
|
|
|
ed4e54 |
@@ -41,7 +41,6 @@ enum crmd_fsa_state fsa_state = S_STARTING;
|
|
|
ed4e54 |
|
|
|
ed4e54 |
extern uint highest_born_on;
|
|
|
ed4e54 |
extern uint num_join_invites;
|
|
|
ed4e54 |
-extern void initialize_join(gboolean before);
|
|
|
ed4e54 |
|
|
|
ed4e54 |
#define DOT_PREFIX "actions:trace: "
|
|
|
ed4e54 |
#define do_dot_log(fmt, args...) crm_trace( fmt, ##args)
|
|
|
ed4e54 |
diff --git a/daemons/controld/controld_fsa.h b/daemons/controld/controld_fsa.h
|
|
|
ed4e54 |
index 06794cb..8aaaadf 100644
|
|
|
ed4e54 |
--- a/daemons/controld/controld_fsa.h
|
|
|
ed4e54 |
+++ b/daemons/controld/controld_fsa.h
|
|
|
ed4e54 |
@@ -1,5 +1,5 @@
|
|
|
ed4e54 |
/*
|
|
|
ed4e54 |
- * Copyright 2004-2019 the Pacemaker project contributors
|
|
|
ed4e54 |
+ * Copyright 2004-2020 the Pacemaker project contributors
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
* The version control history for this file may have further details.
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
@@ -484,7 +484,7 @@ extern gboolean ever_had_quorum;
|
|
|
ed4e54 |
// These should be moved elsewhere
|
|
|
ed4e54 |
void do_update_cib_nodes(gboolean overwrite, const char *caller);
|
|
|
ed4e54 |
int crmd_cib_smart_opt(void);
|
|
|
ed4e54 |
-xmlNode *do_lrm_query(gboolean, const char *node_name);
|
|
|
ed4e54 |
+xmlNode *controld_query_executor_state(const char *node_name);
|
|
|
ed4e54 |
|
|
|
ed4e54 |
const char *fsa_input2string(enum crmd_fsa_input input);
|
|
|
ed4e54 |
const char *fsa_state2string(enum crmd_fsa_state state);
|
|
|
ed4e54 |
diff --git a/daemons/controld/controld_join_client.c b/daemons/controld/controld_join_client.c
|
|
|
ed4e54 |
index 4ac0d2a..383ee29 100644
|
|
|
ed4e54 |
--- a/daemons/controld/controld_join_client.c
|
|
|
ed4e54 |
+++ b/daemons/controld/controld_join_client.c
|
|
|
ed4e54 |
@@ -1,5 +1,5 @@
|
|
|
ed4e54 |
/*
|
|
|
ed4e54 |
- * Copyright 2004-2019 the Pacemaker project contributors
|
|
|
ed4e54 |
+ * Copyright 2004-2020 the Pacemaker project contributors
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
* The version control history for this file may have further details.
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
@@ -264,7 +264,7 @@ do_cl_join_finalize_respond(long long action,
|
|
|
ed4e54 |
update_dc_expected(input->msg);
|
|
|
ed4e54 |
|
|
|
ed4e54 |
/* send our status section to the DC */
|
|
|
ed4e54 |
- tmp1 = do_lrm_query(TRUE, fsa_our_uname);
|
|
|
ed4e54 |
+ tmp1 = controld_query_executor_state(fsa_our_uname);
|
|
|
ed4e54 |
if (tmp1 != NULL) {
|
|
|
ed4e54 |
xmlNode *reply = create_request(CRM_OP_JOIN_CONFIRM, tmp1, fsa_our_dc,
|
|
|
ed4e54 |
CRM_SYSTEM_DC, CRM_SYSTEM_CRMD, NULL);
|
|
|
ed4e54 |
diff --git a/daemons/controld/controld_join_dc.c b/daemons/controld/controld_join_dc.c
|
|
|
ed4e54 |
index ac6b430..885b2a9 100644
|
|
|
ed4e54 |
--- a/daemons/controld/controld_join_dc.c
|
|
|
ed4e54 |
+++ b/daemons/controld/controld_join_dc.c
|
|
|
ed4e54 |
@@ -1,5 +1,5 @@
|
|
|
ed4e54 |
/*
|
|
|
ed4e54 |
- * Copyright 2004-2019 the Pacemaker project contributors
|
|
|
ed4e54 |
+ * Copyright 2004-2020 the Pacemaker project contributors
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
* The version control history for this file may have further details.
|
|
|
ed4e54 |
*
|
|
|
ed4e54 |
@@ -21,7 +21,6 @@ char *max_epoch = NULL;
|
|
|
ed4e54 |
char *max_generation_from = NULL;
|
|
|
ed4e54 |
xmlNode *max_generation_xml = NULL;
|
|
|
ed4e54 |
|
|
|
ed4e54 |
-void initialize_join(gboolean before);
|
|
|
ed4e54 |
void finalize_join_for(gpointer key, gpointer value, gpointer user_data);
|
|
|
ed4e54 |
void finalize_sync_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void *user_data);
|
|
|
ed4e54 |
gboolean check_join_state(enum crmd_fsa_state cur_state, const char *source);
|
|
|
ed4e54 |
@@ -68,8 +67,8 @@ crm_update_peer_join(const char *source, crm_node_t * node, enum crm_join_phase
|
|
|
ed4e54 |
}
|
|
|
ed4e54 |
}
|
|
|
ed4e54 |
|
|
|
ed4e54 |
-void
|
|
|
ed4e54 |
-initialize_join(gboolean before)
|
|
|
ed4e54 |
+static void
|
|
|
ed4e54 |
+start_join_round()
|
|
|
ed4e54 |
{
|
|
|
ed4e54 |
GHashTableIter iter;
|
|
|
ed4e54 |
crm_node_t *peer = NULL;
|
|
|
ed4e54 |
@@ -80,19 +79,16 @@ initialize_join(gboolean before)
|
|
|
ed4e54 |
while (g_hash_table_iter_next(&iter, NULL, (gpointer *) &peer)) {
|
|
|
ed4e54 |
crm_update_peer_join(__FUNCTION__, peer, crm_join_none);
|
|
|
ed4e54 |
}
|
|
|
ed4e54 |
-
|
|
|
ed4e54 |
- if (before) {
|
|
|
ed4e54 |
- if (max_generation_from != NULL) {
|
|
|
ed4e54 |
- free(max_generation_from);
|
|
|
ed4e54 |
- max_generation_from = NULL;
|
|
|
ed4e54 |
- }
|
|
|
ed4e54 |
- if (max_generation_xml != NULL) {
|
|
|
ed4e54 |
- free_xml(max_generation_xml);
|
|
|
ed4e54 |
- max_generation_xml = NULL;
|
|
|
ed4e54 |
- }
|
|
|
ed4e54 |
- clear_bit(fsa_input_register, R_HAVE_CIB);
|
|
|
ed4e54 |
- clear_bit(fsa_input_register, R_CIB_ASKED);
|
|
|
ed4e54 |
+ if (max_generation_from != NULL) {
|
|
|
ed4e54 |
+ free(max_generation_from);
|
|
|
ed4e54 |
+ max_generation_from = NULL;
|
|
|
ed4e54 |
+ }
|
|
|
ed4e54 |
+ if (max_generation_xml != NULL) {
|
|
|
ed4e54 |
+ free_xml(max_generation_xml);
|
|
|
ed4e54 |
+ max_generation_xml = NULL;
|
|
|
ed4e54 |
}
|
|
|
ed4e54 |
+ clear_bit(fsa_input_register, R_HAVE_CIB);
|
|
|
ed4e54 |
+ clear_bit(fsa_input_register, R_CIB_ASKED);
|
|
|
ed4e54 |
}
|
|
|
ed4e54 |
|
|
|
ed4e54 |
/*!
|
|
|
ed4e54 |
@@ -192,7 +188,7 @@ do_dc_join_offer_all(long long action,
|
|
|
ed4e54 |
* will be seen as offline by the scheduler anyway.
|
|
|
ed4e54 |
*/
|
|
|
ed4e54 |
current_join_id++;
|
|
|
ed4e54 |
- initialize_join(TRUE);
|
|
|
ed4e54 |
+ start_join_round();
|
|
|
ed4e54 |
/* do_update_cib_nodes(TRUE, __FUNCTION__); */
|
|
|
ed4e54 |
|
|
|
ed4e54 |
update_dc(NULL);
|
|
|
ed4e54 |
@@ -590,7 +586,7 @@ do_dc_join_ack(long long action,
|
|
|
ed4e54 |
controld_delete_node_state(join_from, controld_section_lrm,
|
|
|
ed4e54 |
cib_scope_local);
|
|
|
ed4e54 |
if (safe_str_eq(join_from, fsa_our_uname)) {
|
|
|
ed4e54 |
- xmlNode *now_dc_lrmd_state = do_lrm_query(TRUE, fsa_our_uname);
|
|
|
ed4e54 |
+ xmlNode *now_dc_lrmd_state = controld_query_executor_state(fsa_our_uname);
|
|
|
ed4e54 |
|
|
|
ed4e54 |
if (now_dc_lrmd_state != NULL) {
|
|
|
ed4e54 |
fsa_cib_update(XML_CIB_TAG_STATUS, now_dc_lrmd_state,
|
|
|
ed4e54 |
--
|
|
|
ed4e54 |
1.8.3.1
|
|
|
ed4e54 |
|