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

Add default for missing MASTER_LOG_POS

Browse Source 
Add default for missing MASTER_LOG_POS

4 if binlog is a new one
current pos if binlog = current one
This commit is contained in:
MassimilianoPinto
2015-06-23 17:19:54 +02:00
parent 7a0a010a86
commit 543873a44f
1 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
server/modules/routing/binlog/blr_slave.c
View File

@ -2432,6 +2432,8 @@ int blr_handle_change_master(ROUTER_INSTANCE* router, char *command, char *error
char *master_user = NULL; char *master_user = NULL;
char *master_password = NULL; char *master_password = NULL;
int change_binlog = 0; int change_binlog = 0;
long long pos = 0;
char *passed_pos = NULL;
MASTER_SERVER_CFG *current_master = NULL; MASTER_SERVER_CFG *current_master = NULL;
/* save current replication parameters */ /* save current replication parameters */
@ -2485,81 +2487,87 @@ int blr_handle_change_master(ROUTER_INSTANCE* router, char *command, char *error
} }
/* Change the position in the current or new binlog filename */ /* Change the position in the current or new binlog filename */
if (master_log_pos) { if (master_log_pos == NULL) {
char *passed_pos = master_log_pos + 15; pos = 0;
long long pos = atoll(passed_pos); } else {
passed_pos = master_log_pos + 15;
pos = atoll(passed_pos);
}
free(master_log_pos); /* if binlog name has changed to next one only position 4 is allowed */
if (strcmp(master_logfile, router->binlog_name)) {
if (pos > 0 && pos != 4) {
/* if binlog name has changed to next one only position 4 is allowed */ snprintf(error, BINLOG_ERROR_MSG_LEN, "Can not set MASTER_LOG_POS to %s for MASTER_LOG_FILE %s: "
if (strcmp(master_logfile, router->binlog_name)) { "Permitted binlog pos is %d. Current master_log_file=%s, master_log_pos=%lu",
if (pos != 4) { passed_pos,
master_logfile,
4,
router->binlog_name,
router->binlog_position);
snprintf(error, BINLOG_ERROR_MSG_LEN, "Can not set MASTER_LOG_POS to %s for MASTER_LOG_FILE %s: " LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, "%s: %s", router->service->name, error)));
"Permitted binlog pos is %d. Current master_log_file=%s, master_log_pos=%lu",
passed_pos,
master_logfile,
4,
router->binlog_name,
router->binlog_position);
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, "%s: %s", router->service->name, error))); if (master_log_pos)
free(master_log_pos);
free(master_logfile);
/* restore previous master_host and master_port */
blr_master_restore_config(router, current_master);
spinlock_release(&router->lock);
return -1;
} else {
/* set new filename and pos */
memset(router->binlog_name, '\0', sizeof(router->binlog_name));
strncpy(router->binlog_name, master_logfile, BINLOG_FNAMELEN);
router->binlog_position = 4;
free(master_logfile);
LOGIF(LT, (skygw_log_write(LOGFILE_TRACE, "%s: New MASTER_LOG_FILE is [%s]",
router->service->name,
router->binlog_name)));
}
} else {
free(master_logfile); free(master_logfile);
/* Position cannot be different from current pos */ /* restore previous master_host and master_port */
if (pos != router->binlog_position) { blr_master_restore_config(router, current_master);
snprintf(error, BINLOG_ERROR_MSG_LEN, "Can not set MASTER_LOG_POS to %s: " spinlock_release(&router->lock);
"Permitted binlog pos is %lu. Current master_log_file=%s, master_log_pos=%lu",
passed_pos,
router->binlog_position,
router->binlog_name,
router->binlog_position);
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, "%s: %s", router->service->name, error))); return -1;
/* restore previous master_host and master_port */ } else {
blr_master_restore_config(router, current_master); /* set new filename and pos */
memset(router->binlog_name, '\0', sizeof(router->binlog_name));
strncpy(router->binlog_name, master_logfile, BINLOG_FNAMELEN);
spinlock_release(&router->lock); router->binlog_position = 4;
return -1; if (master_log_pos)
free(master_log_pos);
free(master_logfile);
} else { LOGIF(LT, (skygw_log_write(LOGFILE_TRACE, "%s: New MASTER_LOG_FILE is [%s]",
/* set new position */ router->service->name,
router->binlog_position = pos; router->binlog_name)));
}
} }
} else {
/* Position cannot be different from current pos */
if (pos > 0 && pos != router->binlog_position) {
LOGIF(LT, (skygw_log_write(LOGFILE_TRACE, "%s: New MASTER_LOG_POS is [%u]", snprintf(error, BINLOG_ERROR_MSG_LEN, "Can not set MASTER_LOG_POS to %s: "
router->service->name, "Permitted binlog pos is %lu. Current master_log_file=%s, master_log_pos=%lu",
router->binlog_position))); passed_pos,
router->binlog_position,
router->binlog_name,
router->binlog_position);
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, "%s: %s", router->service->name, error)));
if (master_log_pos)
free(master_log_pos);
free(master_logfile);
/* restore previous master_host and master_port */
blr_master_restore_config(router, current_master);
spinlock_release(&router->lock);
return -1;
} else {
if (master_log_pos)
free(master_log_pos);
free(master_logfile);
}
} }
LOGIF(LT, (skygw_log_write(LOGFILE_TRACE, "%s: New MASTER_LOG_POS is [%u]",
router->service->name,
router->binlog_position)));
/* Change the replication user */ /* Change the replication user */
if (master_user) { if (master_user) {
char *ptr; char *ptr;