hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup SERVER struct

Browse Source 
Removed one unused field. Rearranged others, clarified comments.
This commit is contained in:
Esa Korhonen
2018-04-26 15:29:41 +03:00
parent ba4700a983
commit 5d010ff712
41 changed files with 301 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/routing/binlogrouter/blr.c
View File

@ -1335,10 +1335,10 @@ closeSession(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session)
*/
MXS_NOTICE("%s: Master %s disconnected after %ld seconds. "
"%lu events read,",
router->service->name, router->service->dbref->server->name,
router->service->name, router->service->dbref->server->address,
time(0) - router->connect_time, router->stats.n_binlogs_ses);
MXS_ERROR("Binlog router close session with master server %s",
router->service->dbref->server->unique_name);
router->service->dbref->server->name);
blr_master_reconnect(router);
return;
}
@ -2360,7 +2360,7 @@ errorReply(MXS_ROUTER *instance,
"%s while connecting to master [%s]:%d. Replication is stopped.",
router->service->name, router->m_errno, router->m_errmsg,
blrm_states[BLRM_TIMESTAMP], msg,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
}
}
@ -2404,7 +2404,7 @@ errorReply(MXS_ROUTER *instance,
"%sattempting reconnect to master [%s]:%d",
router->service->name, mysql_errno, errmsg,
blrm_states[router->master_state], msg,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
}
else
@ -2414,7 +2414,7 @@ errorReply(MXS_ROUTER *instance,
"%snot retrying a new connection to master [%s]:%d",
router->service->name,
blrm_states[router->master_state], msg,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
}
@ -2440,7 +2440,7 @@ errorReply(MXS_ROUTER *instance,
MXS_NOTICE("%s: Master %s disconnected after %ld seconds. "
"%lu events read.",
router->service->name, router->service->dbref->server->name,
router->service->name, router->service->dbref->server->address,
time(0) - router->connect_time, router->stats.n_binlogs_ses);
blr_master_reconnect(router);
}
@ -3105,7 +3105,7 @@ destroyInstance(MXS_ROUTER *instance)
MXS_INFO("%s is being stopped by MaxScale shudown. Disconnecting from master [%s]:%d, "
"read up to log %s, pos %lu, transaction safe pos %lu",
inst->service->name,
inst->service->dbref->server->name,
inst->service->dbref->server->address,
inst->service->dbref->server->port,
inst->binlog_name, inst->current_pos, inst->binlog_position);

2
server/modules/routing/binlogrouter/blr_file.c
View File

@ -3152,7 +3152,7 @@ blr_file_write_master_config(ROUTER_INSTANCE *router, char *error)
fprintf(config_file, "[%s]\n", section);
/* write ini file key=value */
fprintf(config_file, "master_host=%s\n", router->service->dbref->server->name);
fprintf(config_file, "master_host=%s\n", router->service->dbref->server->address);
fprintf(config_file, "master_port=%d\n", router->service->dbref->server->port);
fprintf(config_file, "master_user=%s\n", router->user);
fprintf(config_file, "master_password=%s\n", router->password);

26
server/modules/routing/binlogrouter/blr_master.c
View File

@ -196,7 +196,7 @@ static void blr_start_master(void* data)
"reached %d maximum number of retries. "
"Replication is stopped.",
router->service->name,
router->service->dbref->server->unique_name,
router->service->dbref->server->name,
router->retry_limit);
return;
}
@ -261,17 +261,17 @@ static void blr_start_master(void* data)
MXS_ERROR("%s: failure while connecting to master server '%s', "
"retrying in %d seconds",
router->service->name,
router->service->dbref->server->unique_name,
router->service->dbref->server->name,
connect_retry);
return;
}
router->master->remote = MXS_STRDUP_A(router->service->dbref->server->name);
router->master->remote = MXS_STRDUP_A(router->service->dbref->server->address);
router->master->service = router->service;
MXS_NOTICE("%s: attempting to connect to master"
" server [%s]:%d, binlog='%s', pos=%lu%s%s",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port,
router->binlog_name,
router->current_pos,
@ -408,7 +408,7 @@ blr_restart_master(ROUTER_INSTANCE *router)
"reached %d maximum number of retries. "
"Replication is stopped.",
router->service->name,
router->service->dbref->server->unique_name,
router->service->dbref->server->name,
router->retry_limit);
return;
}
@ -434,7 +434,7 @@ blr_restart_master(ROUTER_INSTANCE *router)
MXS_ERROR("%s: failed to connect to master server '%s', "
"retrying in %d seconds",
router->service->name,
router->service->dbref->server->unique_name,
router->service->dbref->server->name,
connect_retry);
}
}
@ -1425,7 +1425,7 @@ blr_handle_binlog_record(ROUTER_INSTANCE *router, GWBUF *pkt)
"be sent to the master server [%s]:%d",
router->service->name, router->binlog_name,
router->current_pos,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
/* Send Semi-Sync ACK packet to master server */
@ -1993,7 +1993,7 @@ blr_check_heartbeat(ROUTER_INSTANCE *router)
MXS_ERROR("No event received from master [%s]:%d in heartbeat period (%lu seconds), "
"last event (%s %d) received %lu seconds ago. Assuming connection is dead "
"and reconnecting.",
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port,
router->heartbeat,
event_desc != NULL ? event_desc : "unknown",
@ -2818,7 +2818,7 @@ static void blr_register_getsemisync(ROUTER_INSTANCE *router, GWBUF *buf)
{
MXS_NOTICE("%s: checking Semi-Sync replication capability for master server [%s]:%d",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
// New registration message
@ -2853,7 +2853,7 @@ static bool blr_register_setsemisync(ROUTER_INSTANCE *router, GWBUF *buf)
/* not installed */
MXS_NOTICE("%s: master server [%s]:%d doesn't have semi_sync capability",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
/* Continue without semisync */
@ -2869,7 +2869,7 @@ static bool blr_register_setsemisync(ROUTER_INSTANCE *router, GWBUF *buf)
MXS_NOTICE("%s: master server [%s]:%d doesn't have semi_sync"
" enabled right now, Request Semi-Sync Replication anyway",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
}
else
@ -2878,7 +2878,7 @@ static bool blr_register_setsemisync(ROUTER_INSTANCE *router, GWBUF *buf)
MXS_NOTICE("%s: master server [%s]:%d has semi_sync enabled,"
" Requesting Semi-Sync Replication",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
}
@ -3264,7 +3264,7 @@ static void blr_start_master_registration(ROUTER_INSTANCE *router, GWBUF *buf)
"position %lu from master server [%s]:%d",
router->service->name, router->binlog_name,
router->current_pos,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port);
}

14
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -1338,8 +1338,8 @@ blr_slave_send_slave_status(ROUTER_INSTANCE *router,
snprintf(column,
max_column_size,
"%s",
router->service->dbref->server->name ?
router->service->dbref->server->name :
router->service->dbref->server->address ?
router->service->dbref->server->address :
"");
col_len = strlen(column);
*ptr++ = col_len; // Length of result string
@ -3906,7 +3906,7 @@ blr_stop_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
router->service->name,
slave->dcb->user,
slave->dcb->remote,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port,
router->binlog_name,
router->current_pos,
@ -4117,7 +4117,7 @@ blr_start_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
router->service->name,
slave->dcb->user,
slave->dcb->remote,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port,
router->binlog_name,
router->current_pos,
@ -4487,7 +4487,7 @@ blr_set_master_hostname(ROUTER_INSTANCE *router, char *hostname)
MXS_INFO("%s: New MASTER_HOST is [%s]",
router->service->name,
router->service->dbref->server->name);
router->service->dbref->server->address);
return 1;
}
@ -4679,7 +4679,7 @@ blr_master_get_config(ROUTER_INSTANCE *router, MASTER_SERVER_CFG *curr_master)
SSL_LISTENER *server_ssl;
curr_master->port = router->service->dbref->server->port;
curr_master->host = MXS_STRDUP_A(router->service->dbref->server->name);
curr_master->host = MXS_STRDUP_A(router->service->dbref->server->address);
curr_master->pos = router->current_pos;
curr_master->safe_pos = router->binlog_position;
strcpy(curr_master->logfile, router->binlog_name); // Same size
@ -9212,7 +9212,7 @@ static void blr_log_config_changes(ROUTER_INSTANCE *router,
current_master->logfile,
current_master->pos,
current_master->user,
router->service->dbref->server->name,
router->service->dbref->server->address,
router->service->dbref->server->port,
router->binlog_name,
router->current_pos,