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

start slave may create a new binlog file

Browse Source 
start slave may create a new binlog file
This commit is contained in:
MassimilianoPinto
2015-06-23 10:05:39 +02:00
parent 2816d87013
commit 022179ca12
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/modules/routing/binlog/blr_file.c
View File

@ -27,6 +27,7 @@
* 14/04/2014 Mark Riddoch Initial implementation * 14/04/2014 Mark Riddoch Initial implementation
* 08/06/2015 Massimiliano Pinto Addition of blr_cache_read_master_data() * 08/06/2015 Massimiliano Pinto Addition of blr_cache_read_master_data()
* 15/06/2015 Massimiliano Pinto Addition of blr_file_get_next_binlogname() * 15/06/2015 Massimiliano Pinto Addition of blr_file_get_next_binlogname()
* 23/06/2015 Massimiliano Pinto Addition of blr_file_use_binlog, blr_file_create_binlog
* *
* @endverbatim * @endverbatim
*/ */
@ -63,6 +64,8 @@ static uint32_t extract_field(uint8_t *src, int bits);
static void blr_log_header(logfile_id_t file, char *msg, uint8_t *ptr); static void blr_log_header(logfile_id_t file, char *msg, uint8_t *ptr);
void blr_cache_read_master_data(ROUTER_INSTANCE *router); void blr_cache_read_master_data(ROUTER_INSTANCE *router);
int blr_file_get_next_binlogname(ROUTER_INSTANCE *router); int blr_file_get_next_binlogname(ROUTER_INSTANCE *router);
int blr_file_new_binlog(ROUTER_INSTANCE *router, char *file);
void blr_file_use_binlog(ROUTER_INSTANCE *router, char *file);
/** /**
* Initialise the binlog file for this instance. MaxScale will look * Initialise the binlog file for this instance. MaxScale will look
@ -800,3 +803,27 @@ int filenum;
return filenum; return filenum;
} }
/**
* Create a new binlog file
*
* @param router The router instance
* @param file The new binlog file
* @return 1 on success, 0 on failure
*/
int
blr_file_new_binlog(ROUTER_INSTANCE *router, char *file)
{
return blr_file_create(router, file);
}
/**
* Use current binlog file
* @param router The router instance
* @param file The binlog file
*/
void
blr_file_use_binlog(ROUTER_INSTANCE *router, char *file)
{
return blr_file_append(router, file);
}

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

@ -2320,6 +2320,13 @@ blr_start_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
spinlock_acquire(&router->lock); spinlock_acquire(&router->lock);
router->master_state = BLRM_UNCONNECTED; router->master_state = BLRM_UNCONNECTED;
spinlock_release(&router->lock); spinlock_release(&router->lock);
/* create a new binlog or just use current one */
if (strcmp(router->prevbinlog, router->binlog_name))
blr_file_new_binlog(router, router->binlog_name);
else
blr_file_use_binlog(router, router->binlog_name);
blr_start_master(router); blr_start_master(router);
return blr_slave_send_ok(router, slave); return blr_slave_send_ok(router, slave);