Bug#22897202: RPL_IO_THD_WAIT_FOR_DISK_SPACE HAS OCCASIONAL

FAILURES

Merge branch 'mysql-5.5' into mysql-5.6

Author: Sujatha Sivakumar

mysql-test/suite/rpl/r/rpl_io_thd_wait_for_disk_space.result

@@ -10,7 +10,7 @@ CALL mtr.add_suppression("Retry in 60 secs");
 include/stop_slave_sql.inc
 SET @@GLOBAL.DEBUG= 'd,simulate_io_thd_wait_for_disk_space';
 INSERT INTO t1 VALUES(2);
-include/wait_for_slave_param.inc [Slave_IO_State]
+set debug_sync='now WAIT_FOR parked';
 SET @@GLOBAL.DEBUG= '$debug_saved';
 include/assert_grep.inc [Found the disk full error message on the slave]
 include/start_slave_sql.inc

mysql-test/suite/rpl/t/rpl_io_thd_wait_for_disk_space.test

@@ -42,16 +42,13 @@ SET @@GLOBAL.DEBUG= 'd,simulate_io_thd_wait_for_disk_space';
 --connection master
 INSERT INTO t1 VALUES(2);
 
---connection slave
-# Wait until IO thread is queuing events from master
-# Notice that this is performed by querying SHOW SLAVE STATUS
---let $slave_param= Slave_IO_State
---let $slave_param_value= Queueing master event to the relay log
---source include/wait_for_slave_param.inc
+--connection slave1
+set debug_sync='now WAIT_FOR parked';
 
 # Get the relay log file name, also using SHOW SLAVE STATUS
 --let $relay_log_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
 
+--connection slave
 # Restore the debug options to "simulate" freed space on disk
 SET @@GLOBAL.DEBUG= '$debug_saved';
 

mysys/errors.c

@@ -15,6 +15,7 @@
 
 #include "mysys_priv.h"
 #include "mysys_err.h"
+#include "m_string.h"
 
 #ifndef SHARED_LIBRARY
 
@@ -129,6 +130,7 @@ void wait_for_free_space(const char *filename, int errors)
                  });
 
   (void) sleep(time_to_sleep);
+  DEBUG_SYNC_C("disk_full_reached");
 }
 
 const char **get_global_errmsgs()

sql/binlog.cc

@@ -5172,6 +5172,13 @@ bool MYSQL_BIN_LOG::append_buffer(const char* buf, uint len, Master_info *mi)
     sufficient to block SQL thread when IO thread is updating relay log here.
   */
   mysql_mutex_unlock(&mi->data_lock);
+  DBUG_EXECUTE_IF("simulate_io_thd_wait_for_disk_space",
+                  {
+                  const char act[]= "disk_full_reached SIGNAL parked";
+                  DBUG_ASSERT(opt_debug_sync_timeout > 0);
+                  DBUG_ASSERT(!debug_sync_set_action(current_thd,
+                                                     STRING_WITH_LEN(act)));
+                  };);
   // write data
   bool error= false;
   if (my_b_append(&log_file,(uchar*) buf,len) == 0)