Rename MXS_MONITOR::databases to MXS_MONITOR::monitored_servers

More descriptive name. Some local varaibles could now also be
renamed to be more descriptive, but that's for another day.
This commit is contained in:
Johan Wikman
2017-10-02 15:31:54 +03:00
parent 8d03876e3e
commit 68432bbaa3
9 changed files with 71 additions and 71 deletions

View File

@ -182,7 +182,7 @@ struct mxs_monitor
char password[MAX_MONITOR_PASSWORD_LEN]; /*< Monitor password */
SPINLOCK lock;
MXS_CONFIG_PARAMETER* parameters; /*< configuration parameters */
MXS_MONITORED_SERVER* databases; /*< List of databases the monitor monitors */
MXS_MONITORED_SERVER* monitored_servers; /*< List of servers the monitor monitors */
monitor_state_t state; /**< The state of the monitor */
int connect_timeout; /**< Connect timeout in seconds for mysql_real_connect */
int connect_attempts; /**< How many times a connection is attempted */

View File

@ -960,9 +960,9 @@ bool runtime_destroy_monitor(MXS_MONITOR *monitor)
{
monitorStop(monitor);
while (monitor->databases)
while (monitor->monitored_servers)
{
monitorRemoveServer(monitor, monitor->databases->server);
monitorRemoveServer(monitor, monitor->monitored_servers->server);
}
monitorDestroy(monitor);
MXS_NOTICE("Destroyed monitor '%s'", monitor->name);

View File

@ -123,7 +123,7 @@ MXS_MONITOR* monitor_alloc(const char *name, const char *module)
mon->name = my_name;
mon->module_name = my_module;
mon->handle = NULL;
mon->databases = NULL;
mon->monitored_servers = NULL;
*mon->password = '\0';
*mon->user = '\0';
mon->read_timeout = DEFAULT_READ_TIMEOUT;
@ -176,7 +176,7 @@ monitor_free(MXS_MONITOR *mon)
}
spinlock_release(&monLock);
config_parameter_free(mon->parameters);
monitor_server_free_all(mon->databases);
monitor_server_free_all(mon->monitored_servers);
MXS_FREE(mon->name);
MXS_FREE(mon->module_name);
MXS_FREE(mon);
@ -253,7 +253,7 @@ monitorStop(MXS_MONITOR *monitor)
monitor->module->stopMonitor(monitor);
monitor->state = MONITOR_STATE_STOPPED;
MXS_MONITORED_SERVER* db = monitor->databases;
MXS_MONITORED_SERVER* db = monitor->monitored_servers;
while (db)
{
// TODO: Create a generic entry point for this or move it inside stopMonitor
@ -335,13 +335,13 @@ bool monitorAddServer(MXS_MONITOR *mon, SERVER *server)
spinlock_acquire(&mon->lock);
if (mon->databases == NULL)
if (mon->monitored_servers == NULL)
{
mon->databases = db;
mon->monitored_servers = db;
}
else
{
MXS_MONITORED_SERVER *ptr = mon->databases;
MXS_MONITORED_SERVER *ptr = mon->monitored_servers;
while (ptr->next != NULL)
{
ptr = ptr->next;
@ -402,11 +402,11 @@ void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server)
spinlock_acquire(&mon->lock);
MXS_MONITORED_SERVER *ptr = mon->databases;
MXS_MONITORED_SERVER *ptr = mon->monitored_servers;
if (ptr && ptr->server == server)
{
mon->databases = mon->databases->next;
mon->monitored_servers = mon->monitored_servers->next;
}
else
{
@ -522,7 +522,7 @@ monitorShow(DCB *dcb, MXS_MONITOR *monitor)
const char *sep = "";
for (MXS_MONITORED_SERVER *db = monitor->databases; db; db = db->next)
for (MXS_MONITORED_SERVER *db = monitor->monitored_servers; db; db = db->next)
{
dcb_printf(dcb, "%s[%s]:%d", sep, db->server->name, db->server->port);
sep = ", ";
@ -782,7 +782,7 @@ monitorGetList()
*/
bool check_monitor_permissions(MXS_MONITOR* monitor, const char* query)
{
if (monitor->databases == NULL || // No servers to check
if (monitor->monitored_servers == NULL || // No servers to check
config_get_global_options()->skip_permission_checks)
{
return true;
@ -793,7 +793,7 @@ bool check_monitor_permissions(MXS_MONITOR* monitor, const char* query)
MXS_CONFIG* cnf = config_get_global_options();
bool rval = false;
for (MXS_MONITORED_SERVER *mondb = monitor->databases; mondb; mondb = mondb->next)
for (MXS_MONITORED_SERVER *mondb = monitor->monitored_servers; mondb; mondb = mondb->next)
{
if (mon_ping_or_connect_to_db(monitor, mondb) != MONITOR_CONN_OK)
{
@ -1223,7 +1223,7 @@ monitor_launch_script(MXS_MONITOR* mon, MXS_MONITORED_SERVER* ptr, const char* s
if (externcmd_matches(cmd, "$PARENT"))
{
std::stringstream ss;
MXS_MONITORED_SERVER* parent = find_parent_node(mon->databases, ptr);
MXS_MONITORED_SERVER* parent = find_parent_node(mon->monitored_servers, ptr);
if (parent)
{
@ -1234,7 +1234,7 @@ monitor_launch_script(MXS_MONITOR* mon, MXS_MONITORED_SERVER* ptr, const char* s
if (externcmd_matches(cmd, "$CHILDREN"))
{
externcmd_substitute_arg(cmd, "[$]CHILDREN", child_nodes(mon->databases, ptr).c_str());
externcmd_substitute_arg(cmd, "[$]CHILDREN", child_nodes(mon->monitored_servers, ptr).c_str());
}
if (externcmd_matches(cmd, "$EVENT"))
@ -1246,31 +1246,31 @@ monitor_launch_script(MXS_MONITOR* mon, MXS_MONITORED_SERVER* ptr, const char* s
if (externcmd_matches(cmd, "$NODELIST"))
{
mon_append_node_names(mon->databases, nodelist, sizeof(nodelist), SERVER_RUNNING);
mon_append_node_names(mon->monitored_servers, nodelist, sizeof(nodelist), SERVER_RUNNING);
externcmd_substitute_arg(cmd, "[$]NODELIST", nodelist);
}
if (externcmd_matches(cmd, "$LIST"))
{
mon_append_node_names(mon->databases, nodelist, sizeof(nodelist), 0);
mon_append_node_names(mon->monitored_servers, nodelist, sizeof(nodelist), 0);
externcmd_substitute_arg(cmd, "[$]LIST", nodelist);
}
if (externcmd_matches(cmd, "$MASTERLIST"))
{
mon_append_node_names(mon->databases, nodelist, sizeof(nodelist), SERVER_MASTER);
mon_append_node_names(mon->monitored_servers, nodelist, sizeof(nodelist), SERVER_MASTER);
externcmd_substitute_arg(cmd, "[$]MASTERLIST", nodelist);
}
if (externcmd_matches(cmd, "$SLAVELIST"))
{
mon_append_node_names(mon->databases, nodelist, sizeof(nodelist), SERVER_SLAVE);
mon_append_node_names(mon->monitored_servers, nodelist, sizeof(nodelist), SERVER_SLAVE);
externcmd_substitute_arg(cmd, "[$]SLAVELIST", nodelist);
}
if (externcmd_matches(cmd, "$SYNCEDLIST"))
{
mon_append_node_names(mon->databases, nodelist, sizeof(nodelist), SERVER_JOINED);
mon_append_node_names(mon->monitored_servers, nodelist, sizeof(nodelist), SERVER_JOINED);
externcmd_substitute_arg(cmd, "[$]SYNCEDLIST", nodelist);
}
@ -1451,7 +1451,7 @@ MXS_MONITOR* monitor_server_in_use(const SERVER *server)
if (mon->active)
{
for (MXS_MONITORED_SERVER *db = mon->databases; db && !rval; db = db->next)
for (MXS_MONITORED_SERVER *db = mon->monitored_servers; db && !rval; db = db->next)
{
if (db->server == server)
{
@ -1492,12 +1492,12 @@ static bool create_monitor_config(const MXS_MONITOR *monitor, const char *filena
dprintf(file, "%s=%ld\n", CN_JOURNAL_MAX_AGE, monitor->journal_max_age);
dprintf(file, "%s=%d\n", CN_SCRIPT_TIMEOUT, monitor->script_timeout);
if (monitor->databases)
if (monitor->monitored_servers)
{
dprintf(file, "%s=", CN_SERVERS);
for (MXS_MONITORED_SERVER *db = monitor->databases; db; db = db->next)
for (MXS_MONITORED_SERVER *db = monitor->monitored_servers; db; db = db->next)
{
if (db != monitor->databases)
if (db != monitor->monitored_servers)
{
dprintf(file, ",");
}
@ -1575,7 +1575,7 @@ bool monitor_serialize(const MXS_MONITOR *monitor)
void mon_hangup_failed_servers(MXS_MONITOR *monitor)
{
for (MXS_MONITORED_SERVER *ptr = monitor->databases; ptr; ptr = ptr->next)
for (MXS_MONITORED_SERVER *ptr = monitor->monitored_servers; ptr; ptr = ptr->next)
{
if (mon_status_changed(ptr) &&
(!(SERVER_IS_RUNNING(ptr->server)) ||
@ -1600,7 +1600,7 @@ void mon_report_query_error(MXS_MONITORED_SERVER* db)
*/
void lock_monitor_servers(MXS_MONITOR *monitor)
{
MXS_MONITORED_SERVER *ptr = monitor->databases;
MXS_MONITORED_SERVER *ptr = monitor->monitored_servers;
while (ptr)
{
spinlock_acquire(&ptr->server->lock);
@ -1614,7 +1614,7 @@ void lock_monitor_servers(MXS_MONITOR *monitor)
*/
void release_monitor_servers(MXS_MONITOR *monitor)
{
MXS_MONITORED_SERVER *ptr = monitor->databases;
MXS_MONITORED_SERVER *ptr = monitor->monitored_servers;
while (ptr)
{
spinlock_release(&ptr->server->lock);
@ -1629,7 +1629,7 @@ void release_monitor_servers(MXS_MONITOR *monitor)
*/
void servers_status_pending_to_current(MXS_MONITOR *monitor)
{
MXS_MONITORED_SERVER *ptr = monitor->databases;
MXS_MONITORED_SERVER *ptr = monitor->monitored_servers;
while (ptr)
{
ptr->server->status = ptr->server->status_pending;
@ -1645,7 +1645,7 @@ void servers_status_pending_to_current(MXS_MONITOR *monitor)
*/
void servers_status_current_to_pending(MXS_MONITOR *monitor)
{
MXS_MONITORED_SERVER *ptr = monitor->databases;
MXS_MONITORED_SERVER *ptr = monitor->monitored_servers;
while (ptr)
{
ptr->server->status_pending = ptr->server->status;
@ -1655,7 +1655,7 @@ void servers_status_current_to_pending(MXS_MONITOR *monitor)
void mon_process_state_changes(MXS_MONITOR *monitor, const char *script, uint64_t events)
{
for (MXS_MONITORED_SERVER *ptr = monitor->databases; ptr; ptr = ptr->next)
for (MXS_MONITORED_SERVER *ptr = monitor->monitored_servers; ptr; ptr = ptr->next)
{
if (mon_status_changed(ptr))
{
@ -1748,11 +1748,11 @@ json_t* monitor_json_data(const MXS_MONITOR* monitor, const char* host)
json_t* rel = json_object();
if (monitor->databases)
if (monitor->monitored_servers)
{
json_t* mon_rel = mxs_json_relationship(host, MXS_JSON_API_SERVERS);
for (MXS_MONITORED_SERVER *db = monitor->databases; db; db = db->next)
for (MXS_MONITORED_SERVER *db = monitor->monitored_servers; db; db = db->next)
{
mxs_json_add_relation(mon_rel, db->server->unique_name, CN_SERVERS);
}
@ -1812,7 +1812,7 @@ json_t* monitor_relations_to_server(const SERVER* server, const char* host)
if (mon->active)
{
for (MXS_MONITORED_SERVER* db = mon->databases; db; db = db->next)
for (MXS_MONITORED_SERVER* db = mon->monitored_servers; db; db = db->next)
{
if (db->server == server)
{
@ -1912,7 +1912,7 @@ static void store_data(MXS_MONITOR *monitor, MXS_MONITORED_SERVER *master, uint8
*ptr++ = MMB_SCHEMA_VERSION;
/** Store the states of all servers */
for (MXS_MONITORED_SERVER* db = monitor->databases; db; db = db->next)
for (MXS_MONITORED_SERVER* db = monitor->monitored_servers; db; db = db->next)
{
*ptr++ = (char)SVT_SERVER; // Value type
memcpy(ptr, db->server->unique_name, strlen(db->server->unique_name)); // Name of the server
@ -1998,7 +1998,7 @@ static bool has_null_terminator(const char *data, const char *end)
*/
static const char* process_server(MXS_MONITOR *monitor, const char *data, const char *end)
{
for (MXS_MONITORED_SERVER* db = monitor->databases; db; db = db->next)
for (MXS_MONITORED_SERVER* db = monitor->monitored_servers; db; db = db->next)
{
if (strcmp(db->server->unique_name, data) == 0)
{
@ -2028,7 +2028,7 @@ static const char* process_master(MXS_MONITOR *monitor, MXS_MONITORED_SERVER **m
{
if (master)
{
for (MXS_MONITORED_SERVER* db = monitor->databases; db; db = db->next)
for (MXS_MONITORED_SERVER* db = monitor->monitored_servers; db; db = db->next)
{
if (strcmp(db->server->unique_name, data) == 0)
{
@ -2102,7 +2102,7 @@ void store_server_journal(MXS_MONITOR *monitor, MXS_MONITORED_SERVER *master)
/** Calculate how much memory we need to allocate */
uint32_t size = MMB_LEN_SCHEMA_VERSION + MMB_LEN_CRC32;
for (MXS_MONITORED_SERVER* db = monitor->databases; db; db = db->next)
for (MXS_MONITORED_SERVER* db = monitor->monitored_servers; db; db = db->next)
{
/** Each server is stored as a type byte and a null-terminated string
* followed by eight byte server status. */

View File

@ -125,7 +125,7 @@ monitorMain(void *arg)
lock_monitor_servers(monitor);
servers_status_pending_to_current(monitor);
for (MXS_MONITORED_SERVER *ptr = monitor->databases; ptr; ptr = ptr->next)
for (MXS_MONITORED_SERVER *ptr = monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(monitor, ptr);

View File

@ -534,7 +534,7 @@ monitorMain(void *arg)
lock_monitor_servers(mon);
servers_status_pending_to_current(mon);
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
ptr->mon_prev_status = ptr->server->status;
@ -583,7 +583,7 @@ monitorMain(void *arg)
handle->master = set_cluster_master(handle->master, candidate_master, master_stickiness);
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
@ -668,7 +668,7 @@ monitorMain(void *arg)
*/
static MXS_MONITORED_SERVER *get_candidate_master(MXS_MONITOR* mon)
{
MXS_MONITORED_SERVER *moitor_servers = mon->databases;
MXS_MONITORED_SERVER *moitor_servers = mon->monitored_servers;
MXS_MONITORED_SERVER *candidate_master = NULL;
GALERA_MONITOR* handle = mon->handle;
long min_id = -1;
@ -819,7 +819,7 @@ static void update_sst_donor_nodes(MXS_MONITOR *mon, int is_cluster)
strcpy(donor_list, DONOR_LIST_SET_VAR);
ptr = mon->databases;
ptr = mon->monitored_servers;
/* Create an array of slave nodes */
while (ptr)
@ -1199,7 +1199,7 @@ static void set_cluster_members(MXS_MONITOR *mon)
char *c_uuid = handle->cluster_info.c_uuid;
int c_size = handle->cluster_info.c_size;
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
/* Fetch cluster info for this server, if any */

View File

@ -273,7 +273,7 @@ void GRMon::main()
lock_monitor_servers(m_monitor);
servers_status_pending_to_current(m_monitor);
for (MXS_MONITORED_SERVER *ptr = m_monitor->databases; ptr; ptr = ptr->next)
for (MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(m_monitor, ptr);
}

View File

@ -547,7 +547,7 @@ monitorMain(void *arg)
servers_status_pending_to_current(mon);
/* start from the first server in the list */
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
@ -584,7 +584,7 @@ monitorMain(void *arg)
/* Update server status from monitor pending status on that server*/
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
if (!SERVER_IN_MAINT(ptr->server))
@ -656,7 +656,7 @@ static MXS_MONITORED_SERVER *get_current_master(MXS_MONITOR *mon)
MM_MONITOR* handle = mon->handle;
MXS_MONITORED_SERVER *ptr;
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{

View File

@ -275,7 +275,7 @@ startMonitor(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params)
error = true;
}
if (!init_server_info(handle, monitor->databases))
if (!init_server_info(handle, monitor->monitored_servers))
{
error = true;
}
@ -328,7 +328,7 @@ static void diagnostics(DCB *dcb, const MXS_MONITOR *mon)
dcb_printf(dcb, "Detect Stale Master:\t%s\n", (handle->detectStaleMaster == 1) ? "enabled" : "disabled");
dcb_printf(dcb, "Server information\n\n");
for (MXS_MONITORED_SERVER *db = mon->databases; db; db = db->next)
for (MXS_MONITORED_SERVER *db = mon->monitored_servers; db; db = db->next)
{
MYSQL_SERVER_INFO *serv_info =
static_cast<MYSQL_SERVER_INFO*>(hashtable_fetch(handle->server_info, db->server->unique_name));
@ -376,11 +376,11 @@ static json_t* diagnostics_json(const MXS_MONITOR *mon)
json_object_set_new(rval, "script", json_string(handle->script));
}
if (mon->databases)
if (mon->monitored_servers)
{
json_t* arr = json_array();
for (MXS_MONITORED_SERVER *db = mon->databases; db; db = db->next)
for (MXS_MONITORED_SERVER *db = mon->monitored_servers; db; db = db->next)
{
json_t* srv = json_object();
MYSQL_SERVER_INFO *serv_info =
@ -556,7 +556,7 @@ static inline void monitor_mysql_db(MXS_MONITORED_SERVER* database, MYSQL_SERVER
*/
static MXS_MONITORED_SERVER *build_mysql51_replication_tree(MXS_MONITOR *mon)
{
MXS_MONITORED_SERVER* database = mon->databases;
MXS_MONITORED_SERVER* database = mon->monitored_servers;
MXS_MONITORED_SERVER *ptr, *rval = NULL;
int i;
MYSQL_MONITOR *handle = static_cast<MYSQL_MONITOR*>(mon->handle);
@ -623,12 +623,12 @@ static MXS_MONITORED_SERVER *build_mysql51_replication_tree(MXS_MONITOR *mon)
database = database->next;
}
database = mon->databases;
database = mon->monitored_servers;
/** Set master server IDs */
while (database)
{
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
@ -1190,7 +1190,7 @@ monitorMain(void *arg)
servers_status_pending_to_current(mon);
/* start from the first server in the list */
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
@ -1247,7 +1247,7 @@ monitorMain(void *arg)
ptr = ptr->next;
}
ptr = mon->databases;
ptr = mon->monitored_servers;
/* if only one server is configured, that's is Master */
if (num_servers == 1)
{
@ -1283,10 +1283,10 @@ monitorMain(void *arg)
/** Find all the master server cycles in the cluster graph. If
multiple masters are found, the servers with the read_only
variable set to ON will be assigned the slave status. */
find_graph_cycles(handle, mon->databases, num_servers);
find_graph_cycles(handle, mon->monitored_servers, num_servers);
}
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
MYSQL_SERVER_INFO *serv_info =
@ -1295,8 +1295,8 @@ monitorMain(void *arg)
ss_dassert(serv_info);
if (ptr->server->node_id > 0 && ptr->server->master_id > 0 &&
getSlaveOfNodeId(mon->databases, ptr->server->node_id) &&
getServerByNodeId(mon->databases, ptr->server->master_id) &&
getSlaveOfNodeId(mon->monitored_servers, ptr->server->node_id) &&
getServerByNodeId(mon->monitored_servers, ptr->server->master_id) &&
(!handle->multimaster || serv_info->group == 0))
{
/** This server is both a slave and a master i.e. a relay master */
@ -1315,7 +1315,7 @@ monitorMain(void *arg)
/* Update server status from monitor pending status on that server*/
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
if (!SERVER_IN_MAINT(ptr->server))
@ -1401,10 +1401,10 @@ monitorMain(void *arg)
if we need to do a failover */
if (handle->detect_standalone_master)
{
if (failover_required(handle, mon->databases))
if (failover_required(handle, mon->monitored_servers))
{
/** Other servers have died, initiate a failover to the last remaining server */
do_failover(handle, mon->databases);
do_failover(handle, mon->monitored_servers);
}
else
{
@ -1457,7 +1457,7 @@ monitorMain(void *arg)
SERVER_IS_RELAY_SERVER(root_master->server)))
{
set_master_heartbeat(handle, root_master);
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
@ -1796,7 +1796,7 @@ static MXS_MONITORED_SERVER *get_replication_tree(MXS_MONITOR *mon, int num_serv
long node_id;
int root_level;
ptr = mon->databases;
ptr = mon->monitored_servers;
root_level = num_servers;
while (ptr)
@ -1817,7 +1817,7 @@ static MXS_MONITORED_SERVER *get_replication_tree(MXS_MONITOR *mon, int num_serv
if (node_id < 1)
{
MXS_MONITORED_SERVER *find_slave;
find_slave = getSlaveOfNodeId(mon->databases, current->node_id);
find_slave = getSlaveOfNodeId(mon->monitored_servers, current->node_id);
if (find_slave == NULL)
{
@ -1844,7 +1844,7 @@ static MXS_MONITORED_SERVER *get_replication_tree(MXS_MONITOR *mon, int num_serv
root_level = current->depth;
handle->master = ptr;
}
backend = getServerByNodeId(mon->databases, node_id);
backend = getServerByNodeId(mon->monitored_servers, node_id);
if (backend)
{
@ -1866,7 +1866,7 @@ static MXS_MONITORED_SERVER *get_replication_tree(MXS_MONITOR *mon, int num_serv
MXS_MONITORED_SERVER *master;
current->depth = depth;
master = getServerByNodeId(mon->databases, current->master_id);
master = getServerByNodeId(mon->monitored_servers, current->master_id);
if (master && master->server && master->server->node_id > 0)
{
add_slave_to_master(master->server->slaves, sizeof(master->server->slaves),
@ -2148,7 +2148,7 @@ bool check_replicate_wild_ignore_table(MXS_MONITORED_SERVER* database)
*/
void check_maxscale_schema_replication(MXS_MONITOR *monitor)
{
MXS_MONITORED_SERVER* database = monitor->databases;
MXS_MONITORED_SERVER* database = monitor->monitored_servers;
bool err = false;
while (database)

View File

@ -350,7 +350,7 @@ monitorMain(void *arg)
lock_monitor_servers(mon);
servers_status_pending_to_current(mon);
ptr = mon->databases;
ptr = mon->monitored_servers;
while (ptr)
{
ptr->mon_prev_status = ptr->server->status;