Skip to content

Commit

Permalink
MDEV-10271: add master host/port info to slave thread exit messages
Browse files Browse the repository at this point in the history
Sample log error message generated:

mysql-test/var/log/mysqld.2.err:2021-01-21 13:02:30 8 [Note] Slave SQL thread exiting, replication stopped in log 'master-bin.000001' at position 329, master: 127.0.0.1:16000
mysql-test/var/log/mysqld.2.err:2021-01-21 13:02:30 7 [Note] Slave I/O thread exiting, read up to log 'master-bin.000001', position 329, master 127.0.0.1:16000
mysql-test/var/log/mysqld.2.err:2021-01-21 13:02:30 12 [Note] Slave SQL thread exiting, replication stopped in log 'master-bin.000001' at position 329; GTID position '', master: 127.0.0.1:16000

Reviewer: knielsen@knielsen-hq.org, Andrei and Sachin
  • Loading branch information
hartmut-mariadb authored and grooverdan committed Jan 21, 2021
1 parent 9a08fcb commit fa14c42
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions sql/slave.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5106,15 +5106,16 @@ log space");
// print the current replication position
if (mi->using_gtid == Master_info::USE_GTID_NO)
sql_print_information("Slave I/O thread exiting, read up to log '%s', "
"position %llu", IO_RPL_LOG_NAME, mi->master_log_pos);
"position %llu, master %s:%d", IO_RPL_LOG_NAME, mi->master_log_pos,
mi->host, mi->port);
else
{
StringBuffer<100> tmp;
mi->gtid_current_pos.to_string(&tmp);
sql_print_information("Slave I/O thread exiting, read up to log '%s', "
"position %llu; GTID position %s",
"position %llu; GTID position %s, master %s:%d",
IO_RPL_LOG_NAME, mi->master_log_pos,
tmp.c_ptr_safe());
tmp.c_ptr_safe(), mi->host, mi->port);
}
repl_semisync_slave.slave_stop(mi);
thd->reset_query();
Expand Down Expand Up @@ -5717,8 +5718,9 @@ pthread_handler_t handle_slave_sql(void *arg)
tmp.append(STRING_WITH_LEN("'"));
}
sql_print_information("Slave SQL thread exiting, replication stopped in "
"log '%s' at position %llu%s", RPL_LOG_NAME,
rli->group_master_log_pos, tmp.c_ptr_safe());
"log '%s' at position %llu%s, master: %s:%d", RPL_LOG_NAME,
rli->group_master_log_pos, tmp.c_ptr_safe(),
mi->host, mi->port);
}
#ifdef WITH_WSREP
wsrep_after_command_before_result(thd);
Expand Down

0 comments on commit fa14c42

Please sign in to comment.