mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
MDEV-13073. This patch replaces semisync's native function_enter,exit
and its custom trace faciltiy with standard DBUG_ based equivalents.
This commit is contained in:
Andrei Elkin
Monty
parent
c0ea3056b6
commit
6a84e3407d
4 changed files with 113 additions and 158 deletions
|
|
@ -35,32 +35,6 @@ public:
|
|||
|
||||
unsigned long trace_level_; /* the level for tracing */
|
||||
|
||||
inline void function_enter(const char *func_name)
|
||||
{
|
||||
if (trace_level_ & kTraceFunction)
|
||||
sql_print_information("---> %s enter", func_name);
|
||||
}
|
||||
inline int function_exit(const char *func_name, int exit_code)
|
||||
{
|
||||
if (trace_level_ & kTraceFunction)
|
||||
sql_print_information("<--- %s exit (%d)", func_name, exit_code);
|
||||
return exit_code;
|
||||
}
|
||||
|
||||
inline bool function_exit(const char *func_name, bool exit_code)
|
||||
{
|
||||
if (trace_level_ & kTraceFunction)
|
||||
sql_print_information("<--- %s exit (%s)", func_name,
|
||||
exit_code ? "True" : "False");
|
||||
return exit_code;
|
||||
}
|
||||
|
||||
inline void function_exit(const char *func_name)
|
||||
{
|
||||
if (trace_level_ & kTraceFunction)
|
||||
sql_print_information("<--- %s exit", func_name);
|
||||
}
|
||||
|
||||
Trace()
|
||||
:trace_level_(0L)
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -142,18 +142,18 @@ int ActiveTranx::compare(const char *log_file_name1, my_off_t log_file_pos1,
|
|||
int ActiveTranx::insert_tranx_node(const char *log_file_name,
|
||||
my_off_t log_file_pos)
|
||||
{
|
||||
const char *kWho = "ActiveTranx:insert_tranx_node";
|
||||
TranxNode *ins_node;
|
||||
int result = 0;
|
||||
unsigned int hash_val;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Active_tranx:insert_tranx_node");
|
||||
|
||||
ins_node = allocator_.allocate_node();
|
||||
if (!ins_node)
|
||||
{
|
||||
sql_print_error("%s: transaction node allocation failed for: (%s, %lu)",
|
||||
kWho, log_file_name, (ulong)log_file_pos);
|
||||
"Active_tranx:insert_tranx_node",
|
||||
log_file_name, (ulong)log_file_pos);
|
||||
result = -1;
|
||||
goto l_end;
|
||||
}
|
||||
|
|
@ -185,7 +185,7 @@ int ActiveTranx::insert_tranx_node(const char *log_file_name,
|
|||
* mysql_bin_log.LOCK_log when appending events.
|
||||
*/
|
||||
sql_print_error("%s: binlog write out-of-order, tail (%s, %lu), "
|
||||
"new node (%s, %lu)", kWho,
|
||||
"new node (%s, %lu)", "Active_tranx:insert_tranx_node",
|
||||
trx_rear_->log_name_, (ulong)trx_rear_->log_pos_,
|
||||
ins_node->log_name_, (ulong)ins_node->log_pos_);
|
||||
result = -1;
|
||||
|
|
@ -197,20 +197,19 @@ int ActiveTranx::insert_tranx_node(const char *log_file_name,
|
|||
ins_node->hash_next_ = trx_htb_[hash_val];
|
||||
trx_htb_[hash_val] = ins_node;
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: insert (%s, %lu) in entry(%u)", kWho,
|
||||
DBUG_PRINT("semisync", ("%s: insert (%s, %lu) in entry(%u)",
|
||||
"Active_tranx:insert_tranx_node",
|
||||
ins_node->log_name_, (ulong)ins_node->log_pos_,
|
||||
hash_val);
|
||||
|
||||
hash_val));
|
||||
l_end:
|
||||
return function_exit(kWho, result);
|
||||
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
bool ActiveTranx::is_tranx_end_pos(const char *log_file_name,
|
||||
my_off_t log_file_pos)
|
||||
{
|
||||
const char *kWho = "ActiveTranx::is_tranx_end_pos";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Active_tranx::is_tranx_end_pos");
|
||||
|
||||
unsigned int hash_val = get_hash_value(log_file_name, log_file_pos);
|
||||
TranxNode *entry = trx_htb_[hash_val];
|
||||
|
|
@ -223,21 +222,19 @@ bool ActiveTranx::is_tranx_end_pos(const char *log_file_name,
|
|||
entry = entry->hash_next_;
|
||||
}
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: probe (%s, %lu) in entry(%u)", kWho,
|
||||
log_file_name, (ulong)log_file_pos, hash_val);
|
||||
DBUG_PRINT("semisync", ("%s: probe (%s, %lu) in entry(%u)",
|
||||
"Active_tranx::is_tranx_end_pos",
|
||||
log_file_name, (ulong)log_file_pos, hash_val));
|
||||
|
||||
function_exit(kWho, (entry != NULL));
|
||||
return (entry != NULL);
|
||||
DBUG_RETURN(entry != NULL);
|
||||
}
|
||||
|
||||
int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name,
|
||||
my_off_t log_file_pos)
|
||||
{
|
||||
const char *kWho = "ActiveTranx::::clear_active_tranx_nodes";
|
||||
TranxNode *new_front;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Active_tranx::::clear_active_tranx_nodes");
|
||||
|
||||
if (log_file_name != NULL)
|
||||
{
|
||||
|
|
@ -271,8 +268,8 @@ int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name,
|
|||
trx_rear_ = NULL;
|
||||
}
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: cleared all nodes", kWho);
|
||||
DBUG_PRINT("semisync", ("%s: cleared all nodes",
|
||||
"Active_tranx::::clear_active_tranx_nodes"));
|
||||
}
|
||||
else if (new_front != trx_front_)
|
||||
{
|
||||
|
|
@ -305,13 +302,13 @@ int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name,
|
|||
trx_front_ = new_front;
|
||||
allocator_.free_nodes_before(trx_front_);
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: cleared %d nodes back until pos (%s, %lu)",
|
||||
kWho, n_frees,
|
||||
trx_front_->log_name_, (ulong)trx_front_->log_pos_);
|
||||
DBUG_PRINT("semisync", ("%s: cleared %d nodes back until pos (%s, %lu)",
|
||||
"Active_tranx::::clear_active_tranx_nodes",
|
||||
n_frees,
|
||||
trx_front_->log_name_, (ulong)trx_front_->log_pos_));
|
||||
}
|
||||
|
||||
return function_exit(kWho, 0);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -482,13 +479,14 @@ void ReplSemiSyncMaster::cond_broadcast()
|
|||
|
||||
int ReplSemiSyncMaster::cond_timewait(struct timespec *wait_time)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::cond_timewait()";
|
||||
int wait_res;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::cond_timewait()");
|
||||
|
||||
wait_res= mysql_cond_timedwait(&COND_binlog_send,
|
||||
&LOCK_binlog, wait_time);
|
||||
return function_exit(kWho, wait_res);
|
||||
|
||||
DBUG_RETURN(wait_res);
|
||||
}
|
||||
|
||||
void ReplSemiSyncMaster::add_slave()
|
||||
|
|
@ -520,13 +518,12 @@ void ReplSemiSyncMaster::remove_slave()
|
|||
int ReplSemiSyncMaster::reportReplyPacket(uint32 server_id, const uchar *packet,
|
||||
ulong packet_len)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::reportReplyPacket";
|
||||
int result= -1;
|
||||
char log_file_name[FN_REFLEN+1];
|
||||
my_off_t log_file_pos;
|
||||
ulong log_file_len = 0;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::report_reply_packet");
|
||||
|
||||
if (unlikely(packet[REPLY_MAGIC_NUM_OFFSET] != ReplSemiSyncMaster::kPacketMagicNum))
|
||||
{
|
||||
|
|
@ -552,30 +549,30 @@ int ReplSemiSyncMaster::reportReplyPacket(uint32 server_id, const uchar *packet,
|
|||
|
||||
DBUG_ASSERT(dirname_length(log_file_name) == 0);
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: Got reply(%s, %lu) from server %u",
|
||||
kWho, log_file_name, (ulong)log_file_pos, server_id);
|
||||
DBUG_PRINT("semisync", ("%s: Got reply(%s, %lu) from server %u",
|
||||
"Repl_semi_sync_master::report_reply_packet",
|
||||
log_file_name, (ulong)log_file_pos, server_id));
|
||||
|
||||
rpl_semi_sync_master_get_ack++;
|
||||
reportReplyBinlog(server_id, log_file_name, log_file_pos);
|
||||
|
||||
l_end:
|
||||
return function_exit(kWho, result);
|
||||
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::reportReplyBinlog(uint32 server_id,
|
||||
const char *log_file_name,
|
||||
my_off_t log_file_pos)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::reportReplyBinlog";
|
||||
int cmp;
|
||||
bool can_release_threads = false;
|
||||
bool need_copy_send_pos = true;
|
||||
|
||||
if (!(getMasterEnabled()))
|
||||
return 0;
|
||||
DBUG_ENTER("Repl_semi_sync_master::report_reply_binlog");
|
||||
|
||||
function_enter(kWho);
|
||||
if (!(getMasterEnabled()))
|
||||
DBUG_RETURN(0);
|
||||
|
||||
lock();
|
||||
|
||||
|
|
@ -623,9 +620,9 @@ int ReplSemiSyncMaster::reportReplyBinlog(uint32 server_id,
|
|||
assert(active_tranxs_ != NULL);
|
||||
active_tranxs_->clear_active_tranx_nodes(log_file_name, log_file_pos);
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: Got reply at (%s, %lu)", kWho,
|
||||
log_file_name, (ulong)log_file_pos);
|
||||
DBUG_PRINT("semisync", ("%s: Got reply at (%s, %lu)",
|
||||
"Repl_semi_sync_master::report_reply_binlog",
|
||||
log_file_name, (ulong)log_file_pos));
|
||||
}
|
||||
|
||||
if (rpl_semi_sync_master_wait_sessions > 0)
|
||||
|
|
@ -650,13 +647,13 @@ int ReplSemiSyncMaster::reportReplyBinlog(uint32 server_id,
|
|||
|
||||
if (can_release_threads)
|
||||
{
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: signal all waiting threads.", kWho);
|
||||
DBUG_PRINT("semisync", ("%s: signal all waiting threads.",
|
||||
"Repl_semi_sync_master::report_reply_binlog"));
|
||||
|
||||
cond_broadcast();
|
||||
}
|
||||
|
||||
return function_exit(kWho, 0);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::waitAfterSync(const char *log_file, my_off_t log_pos)
|
||||
|
|
@ -777,9 +774,8 @@ void ReplSemiSyncMaster::dump_end(THD* thd)
|
|||
int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
||||
my_off_t trx_wait_binlog_pos)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::commitTrx";
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::commit_trx");
|
||||
|
||||
if (getMasterEnabled() && trx_wait_binlog_name)
|
||||
{
|
||||
|
|
@ -803,12 +799,10 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
if (!getMasterEnabled() || !is_on())
|
||||
goto l_end;
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
{
|
||||
sql_print_information("%s: wait pos (%s, %lu), repl(%d)\n", kWho,
|
||||
DBUG_PRINT("semisync", ("%s: wait pos (%s, %lu), repl(%d)\n",
|
||||
"Repl_semi_sync_master::commit_trx",
|
||||
trx_wait_binlog_name, (ulong)trx_wait_binlog_pos,
|
||||
(int)is_on());
|
||||
}
|
||||
(int)is_on()));
|
||||
|
||||
while (is_on() && !thd_killed(current_thd))
|
||||
{
|
||||
|
|
@ -821,9 +815,10 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
/* We have already sent the relevant binlog to the slave: no need to
|
||||
* wait here.
|
||||
*/
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: Binlog reply is ahead (%s, %lu),",
|
||||
kWho, reply_file_name_, (ulong)reply_file_pos_);
|
||||
DBUG_PRINT("semisync", ("%s: Binlog reply is ahead (%s, %lu),",
|
||||
"Repl_semi_sync_master::commit_trx",
|
||||
reply_file_name_,
|
||||
(ulong)reply_file_pos_));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -842,9 +837,9 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
wait_file_pos_ = trx_wait_binlog_pos;
|
||||
|
||||
rpl_semi_sync_master_wait_pos_backtraverse++;
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: move back wait position (%s, %lu),",
|
||||
kWho, wait_file_name_, (ulong)wait_file_pos_);
|
||||
DBUG_PRINT("semisync", ("%s: move back wait position (%s, %lu),",
|
||||
"Repl_semi_sync_master::commit_trx",
|
||||
wait_file_name_, (ulong)wait_file_pos_));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -853,9 +848,9 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
wait_file_pos_ = trx_wait_binlog_pos;
|
||||
wait_file_name_inited_ = true;
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: init wait position (%s, %lu),",
|
||||
kWho, wait_file_name_, (ulong)wait_file_pos_);
|
||||
DBUG_PRINT("semisync", ("%s: init wait position (%s, %lu),",
|
||||
"Repl_semi_sync_master::commit_trx",
|
||||
wait_file_name_, (ulong)wait_file_pos_));
|
||||
}
|
||||
|
||||
/* Calcuate the waiting period. */
|
||||
|
|
@ -875,10 +870,10 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
*/
|
||||
rpl_semi_sync_master_wait_sessions++;
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: wait %lu ms for binlog sent (%s, %lu)",
|
||||
kWho, wait_timeout_,
|
||||
wait_file_name_, (ulong)wait_file_pos_);
|
||||
DBUG_PRINT("semisync", ("%s: wait %lu ms for binlog sent (%s, %lu)",
|
||||
"Repl_semi_sync_master::commit_trx",
|
||||
wait_timeout_,
|
||||
wait_file_name_, (ulong)wait_file_pos_));
|
||||
|
||||
wait_result = cond_timewait(&abstime);
|
||||
rpl_semi_sync_master_wait_sessions--;
|
||||
|
|
@ -902,12 +897,10 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
wait_time = getWaitTime(start_ts);
|
||||
if (wait_time < 0)
|
||||
{
|
||||
if (trace_level_ & kTraceGeneral)
|
||||
{
|
||||
sql_print_error("Replication semi-sync getWaitTime fail at "
|
||||
"wait position (%s, %lu)",
|
||||
trx_wait_binlog_name, (ulong)trx_wait_binlog_pos);
|
||||
}
|
||||
DBUG_PRINT("semisync", ("Replication semi-sync getWaitTime fail at "
|
||||
"wait position (%s, %lu)",
|
||||
trx_wait_binlog_name,
|
||||
(ulong)trx_wait_binlog_pos));
|
||||
rpl_semi_sync_master_timefunc_fails++;
|
||||
}
|
||||
else
|
||||
|
|
@ -940,7 +933,7 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
THD_EXIT_COND(NULL, & old_stage);
|
||||
}
|
||||
|
||||
return function_exit(kWho, 0);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
/* Indicate that semi-sync replication is OFF now.
|
||||
|
|
@ -963,10 +956,10 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
|
|||
*/
|
||||
int ReplSemiSyncMaster::switch_off()
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::switch_off";
|
||||
int result;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::switch_off");
|
||||
|
||||
state_ = false;
|
||||
|
||||
/* Clear the active transaction list. */
|
||||
|
|
@ -979,17 +972,16 @@ int ReplSemiSyncMaster::switch_off()
|
|||
sql_print_information("Semi-sync replication switched OFF.");
|
||||
cond_broadcast(); /* wake up all waiting threads */
|
||||
|
||||
return function_exit(kWho, result);
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::try_switch_on(int server_id,
|
||||
const char *log_file_name,
|
||||
my_off_t log_file_pos)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::try_switch_on";
|
||||
bool semi_sync_on = false;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::try_switch_on");
|
||||
|
||||
/* If the current sending event's position is larger than or equal to the
|
||||
* 'largest' commit transaction binlog position, the slave is already
|
||||
|
|
@ -1019,20 +1011,19 @@ int ReplSemiSyncMaster::try_switch_on(int server_id,
|
|||
(ulong)log_file_pos);
|
||||
}
|
||||
|
||||
return function_exit(kWho, 0);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::reserveSyncHeader(String* packet)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::reserveSyncHeader";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::reserve_sync_header");
|
||||
|
||||
/* Set the magic number and the sync status. By default, no sync
|
||||
* is required.
|
||||
*/
|
||||
packet->append(reinterpret_cast<const char*>(kSyncHeader),
|
||||
sizeof(kSyncHeader));
|
||||
return function_exit(kWho, 0);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::updateSyncHeader(THD* thd, unsigned char *packet,
|
||||
|
|
@ -1040,21 +1031,20 @@ int ReplSemiSyncMaster::updateSyncHeader(THD* thd, unsigned char *packet,
|
|||
my_off_t log_file_pos,
|
||||
bool* need_sync)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::updateSyncHeader";
|
||||
int cmp = 0;
|
||||
bool sync = false;
|
||||
|
||||
DBUG_ENTER("Repl_semi_sync_master::update_sync_header");
|
||||
|
||||
/* If the semi-sync master is not enabled, or the slave is not a semi-sync
|
||||
* target, do not request replies from the slave.
|
||||
*/
|
||||
if (!getMasterEnabled() || !thd->semi_sync_slave)
|
||||
{
|
||||
*need_sync = false;
|
||||
return 0;
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
function_enter(kWho);
|
||||
|
||||
lock();
|
||||
|
||||
/* This is the real check inside the mutex. */
|
||||
|
|
@ -1119,10 +1109,10 @@ int ReplSemiSyncMaster::updateSyncHeader(THD* thd, unsigned char *packet,
|
|||
}
|
||||
}
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: server(%d), (%s, %lu) sync(%d), repl(%d)",
|
||||
kWho, thd->variables.server_id, log_file_name,
|
||||
(ulong)log_file_pos, sync, (int)is_on());
|
||||
DBUG_PRINT("semisync", ("%s: server(%lu), (%s, %lu) sync(%d), repl(%d)",
|
||||
"Repl_semi_sync_master::update_sync_header",
|
||||
thd->variables.server_id, log_file_name,
|
||||
(ulong)log_file_pos, sync, (int)is_on()));
|
||||
*need_sync= sync;
|
||||
|
||||
l_end:
|
||||
|
|
@ -1136,16 +1126,15 @@ int ReplSemiSyncMaster::updateSyncHeader(THD* thd, unsigned char *packet,
|
|||
(packet)[2] = kPacketFlagSync;
|
||||
}
|
||||
|
||||
return function_exit(kWho, 0);
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::writeTranxInBinlog(const char* log_file_name,
|
||||
my_off_t log_file_pos)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::writeTranxInBinlog";
|
||||
int result = 0;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::write_tranx_in_binlog");
|
||||
|
||||
lock();
|
||||
|
||||
|
|
@ -1202,17 +1191,16 @@ int ReplSemiSyncMaster::writeTranxInBinlog(const char* log_file_name,
|
|||
l_end:
|
||||
unlock();
|
||||
|
||||
return function_exit(kWho, result);
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::flushNet(THD *thd,
|
||||
const char *event_buf)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::flushNet";
|
||||
int result = -1;
|
||||
NET* net= &thd->net;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::flush_net");
|
||||
|
||||
assert((unsigned char)event_buf[1] == kPacketMagicNum);
|
||||
if ((unsigned char)event_buf[2] != kPacketFlagSync)
|
||||
|
|
@ -1239,15 +1227,15 @@ int ReplSemiSyncMaster::flushNet(THD *thd,
|
|||
|
||||
l_end:
|
||||
thd->clear_error();
|
||||
return function_exit(kWho, result);
|
||||
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::afterResetMaster()
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::afterResetMaster";
|
||||
int result = 0;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::after_reset_master");
|
||||
|
||||
if (rpl_semi_sync_master_enabled)
|
||||
{
|
||||
|
|
@ -1280,20 +1268,19 @@ int ReplSemiSyncMaster::afterResetMaster()
|
|||
|
||||
unlock();
|
||||
|
||||
return function_exit(kWho, result);
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
int ReplSemiSyncMaster::beforeResetMaster()
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncMaster::beforeResetMaster";
|
||||
int result = 0;
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_master::before_reset_master");
|
||||
|
||||
if (rpl_semi_sync_master_enabled)
|
||||
disableMaster();
|
||||
|
||||
return function_exit(kWho, result);
|
||||
DBUG_RETURN(result);
|
||||
}
|
||||
|
||||
void ReplSemiSyncMaster::checkAndSwitch()
|
||||
|
|
|
|||
|
|
@ -36,8 +36,7 @@ pthread_handler_t ack_receive_handler(void *arg)
|
|||
|
||||
Ack_receiver::Ack_receiver()
|
||||
{
|
||||
const char *kWho = "Ack_receiver::Ack_receiver";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Ack_receiver::Ack_receiver");
|
||||
|
||||
m_status= ST_DOWN;
|
||||
mysql_mutex_init(key_ss_mutex_Ack_receiver_mutex, &m_mutex,
|
||||
|
|
@ -45,25 +44,23 @@ Ack_receiver::Ack_receiver()
|
|||
mysql_cond_init(key_ss_cond_Ack_receiver_cond, &m_cond, NULL);
|
||||
m_pid= 0;
|
||||
|
||||
function_exit(kWho);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
void Ack_receiver::cleanup()
|
||||
{
|
||||
const char *kWho = "Ack_receiver::~Ack_receiver";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Ack_receiver::~Ack_receiver");
|
||||
|
||||
stop();
|
||||
mysql_mutex_destroy(&m_mutex);
|
||||
mysql_cond_destroy(&m_cond);
|
||||
|
||||
function_exit(kWho);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
bool Ack_receiver::start()
|
||||
{
|
||||
const char *kWho = "Ack_receiver::start";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Ack_receiver::start");
|
||||
|
||||
mysql_mutex_lock(&m_mutex);
|
||||
if(m_status == ST_DOWN)
|
||||
|
|
@ -87,19 +84,18 @@ bool Ack_receiver::start()
|
|||
m_status= ST_DOWN;
|
||||
mysql_mutex_unlock(&m_mutex);
|
||||
|
||||
return function_exit(kWho, true);
|
||||
DBUG_RETURN(true);
|
||||
}
|
||||
(void) pthread_attr_destroy(&attr);
|
||||
}
|
||||
mysql_mutex_unlock(&m_mutex);
|
||||
|
||||
return function_exit(kWho, false);
|
||||
DBUG_RETURN(false);
|
||||
}
|
||||
|
||||
void Ack_receiver::stop()
|
||||
{
|
||||
const char *kWho = "Ack_receiver::stop";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Ack_receiver::stop");
|
||||
|
||||
mysql_mutex_lock(&m_mutex);
|
||||
if (m_status == ST_UP)
|
||||
|
|
@ -116,17 +112,16 @@ void Ack_receiver::stop()
|
|||
}
|
||||
mysql_mutex_unlock(&m_mutex);
|
||||
|
||||
function_exit(kWho);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
bool Ack_receiver::add_slave(THD *thd)
|
||||
{
|
||||
Slave *slave;
|
||||
const char *kWho = "Ack_receiver::add_slave";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Ack_receiver::add_slave");
|
||||
|
||||
if (!(slave= new Slave))
|
||||
return function_exit(kWho, true);
|
||||
DBUG_RETURN(true);
|
||||
|
||||
slave->thd= thd;
|
||||
slave->vio= *thd->net.vio;
|
||||
|
|
@ -139,15 +134,14 @@ bool Ack_receiver::add_slave(THD *thd)
|
|||
mysql_cond_broadcast(&m_cond);
|
||||
mysql_mutex_unlock(&m_mutex);
|
||||
|
||||
return function_exit(kWho, false);
|
||||
DBUG_RETURN(false);
|
||||
}
|
||||
|
||||
void Ack_receiver::remove_slave(THD *thd)
|
||||
{
|
||||
I_List_iterator<Slave> it(m_slaves);
|
||||
Slave *slave;
|
||||
const char *kWho = "Ack_receiver::remove_slave";
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Ack_receiver::remove_slave");
|
||||
|
||||
mysql_mutex_lock(&m_mutex);
|
||||
|
||||
|
|
@ -161,7 +155,8 @@ void Ack_receiver::remove_slave(THD *thd)
|
|||
}
|
||||
}
|
||||
mysql_mutex_unlock(&m_mutex);
|
||||
function_exit(kWho);
|
||||
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
inline void Ack_receiver::set_stage_info(const PSI_stage_info &stage)
|
||||
|
|
|
|||
|
|
@ -58,9 +58,8 @@ int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header,
|
|||
const char **payload,
|
||||
unsigned long *payload_len)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncSlave::slaveReadSyncHeader";
|
||||
int read_res = 0;
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_slave::slave_read_sync_header");
|
||||
|
||||
if (rpl_semi_sync_slave_status)
|
||||
{
|
||||
|
|
@ -71,8 +70,9 @@ int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header,
|
|||
*payload_len = total_len - 2;
|
||||
*payload = header + 2;
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: reply - %d", kWho, semi_sync_need_reply);
|
||||
DBUG_PRINT("semisync", ("%s: reply - %d",
|
||||
"Repl_semi_sync_slave::slave_read_sync_header",
|
||||
semi_sync_need_reply));
|
||||
|
||||
if (semi_sync_need_reply)
|
||||
*semi_flags |= SEMI_SYNC_NEED_ACK;
|
||||
|
|
@ -90,7 +90,7 @@ int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header,
|
|||
*payload_len= total_len;
|
||||
}
|
||||
|
||||
return function_exit(kWho, read_res);
|
||||
DBUG_RETURN(read_res);
|
||||
}
|
||||
|
||||
int ReplSemiSyncSlave::slaveStart(Master_info *mi)
|
||||
|
|
@ -203,7 +203,6 @@ int ReplSemiSyncSlave::requestTransmit(Master_info *mi)
|
|||
|
||||
int ReplSemiSyncSlave::slaveReply(Master_info *mi)
|
||||
{
|
||||
const char *kWho = "ReplSemiSyncSlave::slaveReply";
|
||||
MYSQL* mysql= mi->mysql;
|
||||
const char *binlog_filename= const_cast<char *>(mi->master_log_name);
|
||||
my_off_t binlog_filepos= mi->master_log_pos;
|
||||
|
|
@ -215,7 +214,7 @@ int ReplSemiSyncSlave::slaveReply(Master_info *mi)
|
|||
int reply_res = 0;
|
||||
int name_len = strlen(binlog_filename);
|
||||
|
||||
function_enter(kWho);
|
||||
DBUG_ENTER("Repl_semi_sync_slave::slave_reply");
|
||||
|
||||
if (rpl_semi_sync_slave_status && semi_sync_need_reply)
|
||||
{
|
||||
|
|
@ -226,9 +225,9 @@ int ReplSemiSyncSlave::slaveReply(Master_info *mi)
|
|||
binlog_filename,
|
||||
name_len + 1 /* including trailing '\0' */);
|
||||
|
||||
if (trace_level_ & kTraceDetail)
|
||||
sql_print_information("%s: reply (%s, %lu)", kWho,
|
||||
binlog_filename, (ulong)binlog_filepos);
|
||||
DBUG_PRINT("semisync", ("%s: reply (%s, %lu)",
|
||||
"Repl_semi_sync_slave::slave_reply",
|
||||
binlog_filename, (ulong)binlog_filepos));
|
||||
|
||||
net_clear(net, 0);
|
||||
/* Send the reply. */
|
||||
|
|
@ -248,5 +247,5 @@ int ReplSemiSyncSlave::slaveReply(Master_info *mi)
|
|||
}
|
||||
}
|
||||
|
||||
return function_exit(kWho, reply_res);
|
||||
DBUG_RETURN(reply_res);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue