#At file:///media/sda3/work/mysql/bzrwork/b31665/5.1-rpl/
2611 He Zhenxing 2008-07-10
BUG#31665 sync_binlog should cause relay logs to be synchronized
BUG#35542 Add option to sync master and relay log to disk after every event
Add sync_relay_log option to server, this option works for relay log
the same as option sync_binlog for binlog. This option also synchronize
master info to disk when set to non-zero value.
Original patches from Sinisa and Mark, with some modifications
modified:
sql/log.cc
sql/log.h
sql/mysql_priv.h
sql/mysqld.cc
sql/rpl_mi.cc
sql/rpl_rli.cc
sql/set_var.h
sql/sql_repl.cc
per-file messages:
sql/log.cc
remove global sync_binlog_counter, it is now a member of MYSQL_BIN_LOG.
initialize mysql_bin_log with the address of sync_binlog_period.
call flush_and_sync when relay events are written.
sql/log.h
Add sync_counter and sync_period_ptr members to MYSQL_BIN_LOG
sql/mysql_priv.h
remove sync_binlog_counter, add sync_relaylog_period variable
sql/mysqld.cc
Add sync-relay-log option
sql/rpl_mi.cc
Synchronize master info if sync_relaylog_period is non-zero.
sql/rpl_rli.cc
Initialize MYSQL_BIN_LOG instance in Relay_log_info with the address of sync_relaylog_period
sql/sql_repl.cc
Add sync_relaylog_period system variable.
=== modified file 'sql/log.cc'
--- a/sql/log.cc 2008-03-31 08:57:18 +0000
+++ b/sql/log.cc 2008-07-10 12:49:10 +0000
@@ -49,8 +49,7 @@
LOGGER logger;
-MYSQL_BIN_LOG mysql_bin_log;
-ulong sync_binlog_counter= 0;
+MYSQL_BIN_LOG mysql_bin_log(&sync_binlog_period);
static bool test_if_number(const char *str,
long *res, bool allow_wildcards);
@@ -2337,9 +2336,10 @@ const char *MYSQL_LOG::generate_name(con
-MYSQL_BIN_LOG::MYSQL_BIN_LOG()
+MYSQL_BIN_LOG::MYSQL_BIN_LOG(ulong *sync_period)
:bytes_written(0), prepared_xids(0), file_id(1), open_count(1),
need_start_event(TRUE), m_table_map_version(0),
+ sync_period_ptr(sync_period),
description_event_for_exec(0), description_event_for_queue(0)
{
/*
@@ -3466,6 +3466,8 @@ bool MYSQL_BIN_LOG::append(Log_event* ev
}
bytes_written+= ev->data_written;
DBUG_PRINT("info",("max_size: %lu",max_size));
+ if (flush_and_sync())
+ goto err;
if ((uint) my_b_append_tell(&log_file) > max_size)
new_file_without_locking();
@@ -3496,6 +3498,8 @@ bool MYSQL_BIN_LOG::appendv(const char*
bytes_written += len;
} while ((buf=va_arg(args,const char*)) && (len=va_arg(args,uint)));
DBUG_PRINT("info",("max_size: %lu",max_size));
+ if (flush_and_sync())
+ goto err;
if ((uint) my_b_append_tell(&log_file) > max_size)
new_file_without_locking();
@@ -3512,9 +3516,10 @@ bool MYSQL_BIN_LOG::flush_and_sync()
safe_mutex_assert_owner(&LOCK_log);
if (flush_io_cache(&log_file))
return 1;
- if (++sync_binlog_counter >= sync_binlog_period && sync_binlog_period)
+ ulong sync_period= get_sync_period();
+ if (sync_period && ++sync_counter >= sync_period)
{
- sync_binlog_counter= 0;
+ sync_counter= 0;
err=my_sync(fd, MYF(MY_WME));
}
return err;
=== modified file 'sql/log.h'
--- a/sql/log.h 2007-10-30 08:03:34 +0000
+++ b/sql/log.h 2008-07-10 12:49:10 +0000
@@ -16,6 +16,8 @@
#ifndef LOG_H
#define LOG_H
+extern pthread_mutex_t LOCK_global_system_variables;
+
class Relay_log_info;
class Format_description_log_event;
@@ -262,6 +264,22 @@ class MYSQL_BIN_LOG: public TC_LOG, priv
ulonglong m_table_map_version;
+ /* pointer to the sync period variable, for binlog this will be
+ sync_binlog_period, for relay log this will be
+ sync_relay_log_period
+ */
+ ulong *sync_period_ptr;
+ ulong sync_counter;
+
+ inline ulong get_sync_period()
+ {
+ ulong value;
+ pthread_mutex_lock(&LOCK_global_system_variables);
+ value= *sync_period_ptr;
+ pthread_mutex_unlock(&LOCK_global_system_variables);
+ return value;
+ }
+
int write_to_file(IO_CACHE *cache);
/*
This is used to start writing to a new log file. The difference from
@@ -285,7 +303,7 @@ public:
Format_description_log_event *description_event_for_exec,
*description_event_for_queue;
- MYSQL_BIN_LOG();
+ MYSQL_BIN_LOG(ulong *sync_period);
/*
note that there's no destructor ~MYSQL_BIN_LOG() !
The reason is that we don't want it to be automatically called
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h 2008-03-31 07:40:39 +0000
+++ b/sql/mysql_priv.h 2008-07-10 12:49:10 +0000
@@ -1874,7 +1874,7 @@ extern ulong specialflag;
#endif /* MYSQL_SERVER || INNODB_COMPATIBILITY_HOOKS */
#ifdef MYSQL_SERVER
extern ulong current_pid;
-extern ulong expire_logs_days, sync_binlog_period, sync_binlog_counter;
+extern ulong expire_logs_days, sync_binlog_period, sync_relaylog_period;
extern ulong opt_tc_log_size, tc_log_max_pages_used, tc_log_page_size;
extern ulong tc_log_page_waits;
extern my_bool relay_log_purge, opt_innodb_safe_binlog, opt_innodb;
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2008-03-31 07:40:39 +0000
+++ b/sql/mysqld.cc 2008-07-10 12:49:10 +0000
@@ -505,7 +505,8 @@ ulong max_prepared_stmt_count;
*/
ulong prepared_stmt_count=0;
ulong thread_id=1L,current_pid;
-ulong slow_launch_threads = 0, sync_binlog_period;
+ulong slow_launch_threads = 0, sync_binlog_period= 0;
+ulong sync_relaylog_period= 0;
ulong expire_logs_days = 0;
ulong rpl_recovery_rank=0;
const char *log_output_str= "FILE";
@@ -5523,7 +5524,8 @@ enum options_mysqld
OPT_MIN_EXAMINED_ROW_LIMIT,
OPT_LOG_SLOW_SLAVE_STATEMENTS,
OPT_OLD_MODE,
- OPT_SLAVE_EXEC_MODE
+ OPT_SLAVE_EXEC_MODE,
+ OPT_SYNC_RELAY_LOG,
};
@@ -6752,6 +6754,11 @@ The minimum value for this variable is 4
"Use 0 (default) to disable synchronous flushing.",
(uchar**) &sync_binlog_period, (uchar**) &sync_binlog_period, 0, GET_ULONG,
REQUIRED_ARG, 0, 0, ULONG_MAX, 0, 1, 0},
+ {"sync-relay-log", OPT_SYNC_RELAY_LOG,
+ "Synchronously flush relay log to disk after every #th event. "
+ "Use 0 (default) to disable synchronous flushing.",
+ (uchar**) &sync_relaylog_period, (uchar**) &sync_relaylog_period, 0, GET_ULONG,
+ REQUIRED_ARG, 0, 0, ~0L, 0, 1, 0},
{"sync-frm", OPT_SYNC_FRM, "Sync .frm to disk on create. Enabled by default.",
(uchar**) &opt_sync_frm, (uchar**) &opt_sync_frm, 0, GET_BOOL, NO_ARG, 1, 0,
0, 0, 0, 0},
=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc 2007-12-14 13:21:37 +0000
+++ b/sql/rpl_mi.cc 2008-07-10 12:49:10 +0000
@@ -342,6 +342,7 @@ int flush_master_info(Master_info* mi, b
{
IO_CACHE* file = &mi->file;
char lbuf[22];
+ int err= 0;
DBUG_ENTER("flush_master_info");
DBUG_PRINT("enter",("master_pos: %ld", (long) mi->master_log_pos));
@@ -358,9 +359,17 @@ int flush_master_info(Master_info* mi, b
When we come to this place in code, relay log may or not be initialized;
the caller is responsible for setting 'flush_relay_log_cache' accordingly.
*/
- if (flush_relay_log_cache &&
- flush_io_cache(mi->rli.relay_log.get_log_file()))
- DBUG_RETURN(2);
+ if (flush_relay_log_cache)
+ {
+ IO_CACHE *log_file= mi->rli.relay_log.get_log_file();
+ if (flush_io_cache(log_file))
+ DBUG_RETURN(2);
+
+ /* Sync to disk if --sync-relay-log is set */
+ if (sync_relaylog_period
+ && my_sync(log_file->file, MY_WME))
+ DBUG_RETURN(2);
+ }
/*
We flushed the relay log BEFORE the master.info file, because if we crash
@@ -388,7 +397,10 @@ int flush_master_info(Master_info* mi, b
mi->password, mi->port, mi->connect_retry,
(int)(mi->ssl), mi->ssl_ca, mi->ssl_capath, mi->ssl_cert,
mi->ssl_cipher, mi->ssl_key, mi->ssl_verify_server_cert);
- DBUG_RETURN(-flush_io_cache(file));
+ err= flush_io_cache(file);
+ if (sync_relaylog_period && !err)
+ err= my_sync(mi->fd, MYF(MY_WME));
+ DBUG_RETURN(-err);
}
=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc 2008-03-26 09:27:00 +0000
+++ b/sql/rpl_rli.cc 2008-07-10 12:49:10 +0000
@@ -32,7 +32,8 @@ int init_strvar_from_file(char *var, int
Relay_log_info::Relay_log_info()
:Slave_reporting_capability("SQL"),
no_storage(FALSE), replicate_same_server_id(::replicate_same_server_id),
- info_fd(-1), cur_log_fd(-1), save_temporary_tables(0),
+ info_fd(-1), cur_log_fd(-1), relay_log(&sync_relaylog_period),
+ save_temporary_tables(0),
#if HAVE_purify
is_fake(FALSE),
#endif
=== modified file 'sql/set_var.h'
--- a/sql/set_var.h 2008-03-25 14:20:42 +0000
+++ b/sql/set_var.h 2008-07-10 12:49:10 +0000
@@ -131,6 +131,31 @@ public:
/*
+ A global variable that is protected by LOCK_global_system_variables
+*/
+class sys_var_global_ptr :public sys_var_global
+{
+public:
+ sys_var_global(sys_var_chain *chain, const char *name_arg,
+ void *value_ptr,
+ pthread_mutex_t *guard_arg,
+ sys_after_update_func after_update_arg=NULL)
+ :sys_var_global(name_arg, after_update_arg, guard_arg),
+ value(value_ptr)
+ { chain_sys_var(chain); }
+
+ bool check(THD *thd, set_var *var);
+ bool update(THD *thd, set_var *var);
+ void set_default(THD *thd, enum_var_type type);
+ SHOW_TYPE show_type() { return SHOW_LONG; }
+ uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base)
+ { return (uchar*) value; }
+
+private:
+ void *value;
+};
+
+/*
A global-only ulong variable that requires its access to be
protected with a mutex.
*/
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc 2008-02-19 12:58:08 +0000
+++ b/sql/sql_repl.cc 2008-07-10 12:49:10 +0000
@@ -1649,15 +1649,6 @@ public:
*/
};
-class sys_var_sync_binlog_period :public sys_var_long_ptr
-{
-public:
- sys_var_sync_binlog_period(sys_var_chain *chain, const char *name_arg,
- ulong *value_ptr)
- :sys_var_long_ptr(chain, name_arg,value_ptr) {}
- bool update(THD *thd, set_var *var);
-};
-
static sys_var_chain vars = { NULL, NULL };
static sys_var_bool_ptr sys_relay_log_purge(&vars, "relay_log_purge",
@@ -1666,7 +1657,8 @@ static sys_var_long_ptr sys_slave_net_ti
&slave_net_timeout);
static sys_var_long_ptr sys_slave_trans_retries(&vars, "slave_transaction_retries",
&slave_trans_retries);
-static sys_var_sync_binlog_period sys_sync_binlog_period(&vars, "sync_binlog", &sync_binlog_period);
+static sys_var_long_ptr sys_sync_binlog_period(&vars, "sync_binlog", &sync_binlog_period);
+static sys_var_long_ptr sys_sync_relaylog_period(&vars, "sync_relaylog", &sync_relaylog_period);
static sys_var_slave_skip_counter sys_slave_skip_counter(&vars, "sql_slave_skip_counter");
static int show_slave_skip_errors(THD *thd, SHOW_VAR *var, char *buff);
@@ -1757,12 +1749,6 @@ bool sys_var_slave_skip_counter::update(
}
-bool sys_var_sync_binlog_period::update(THD *thd, set_var *var)
-{
- sync_binlog_period= (ulong) var->save_result.ulonglong_value;
- return 0;
-}
-
int init_replication_sys_vars()
{
mysql_append_static_vars(fixed_vars, sizeof(fixed_vars) / sizeof(SHOW_VAR));
