• Sven Sandberg's avatar
    BUG#37975: wait_for_slave_* should increase the timeout · 9d4ee0bf
    Sven Sandberg authored
    Problem 1: tests often fail in pushbuild with a timeout when waiting
    for the slave to start/stop/receive error.
    Fix 1: Updated the wait_for_slave_* macros in the following way:
    - The timeout is increased by a factor ten
    - Refactored the macros so that wait_for_slave_param does the work for
    the other macros.
    Problem 2: Tests are often incorrectly written, lacking a
    source include/wait_for_slave_to_[start|stop].inc.
    Fix 2: Improved the chance to get it right by adding
    include/start_slave.inc and include/stop_slave.inc, and updated tests
    to use these.
    Problem 3: The the built-in test language command
    wait_for_slave_to_stop is a misnomer (does not wait for the slave io
    thread) and does not give as much debug info in case of failure as
    the otherwise equivalent macro
    source include/wait_for_slave_sql_to_stop.inc
    Fix 3: Replaced all calls to the built-in command by a call to the
    macro.
    Problem 4: Some, but not all, of the wait_for_slave_* macros had an
    implicit connection slave. This made some tests confusing to read,
    and made it more difficult to use the macro in circular replication
    scenarios, where the connection named master needs to wait.
    Fix 4: Removed the implicit connection slave from all
    wait_for_slave_* macros, and updated tests to use an explicit
    connection slave where necessary.
    Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc
    were unused. Moreover, using them is difficult and error-prone.
    Fix 5: remove these macros.
    Problem 6: log_bin_trust_function_creators_basic failed when running
    tests because it assumed @@global.log_bin_trust_function_creators=1,
    and some tests modified this variable without resetting it to its
    original value.
    Fix 6: All tests that use this variable have been updated so that
    they reset the value at end of test.
    
    
    mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
      Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
    mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
      Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
      Added connection slave since includ/wait_for_slave_sql_to_stop.inc
      does not do that anymore.
    mysql-test/extra/rpl_tests/rpl_log.test:
      Replaced start slave+wait_slave_status by start_slave.inc
    mysql-test/include/reset_master_and_slave.inc:
      replaced start/stop slave by start_slave.inc/stop_slave.inc
    mysql-test/include/sync_slave_io_with_master.inc:
      Improved comments and error message.
    mysql-test/include/wait_for_slave_io_to_stop.inc:
      Refactored to use wait_for_slave_param.inc.
      Removed connection slave.
    mysql-test/include/wait_for_slave_param.inc:
      - Improved usage instructions
      - Added more debug info in case of timeout
      - Added parameters $slave_param_comparison, $slave_timeout,
      $slave_keep_connection, $slave_error_message
    mysql-test/include/wait_for_slave_sql_error.inc:
      Refactored to use wait_for_slave_param.inc.
      Removed connection slave.
    mysql-test/include/wait_for_slave_sql_to_start.inc:
      Refactored to use wait_for_slave_param.inc.
      Removed connection slave.
    mysql-test/include/wait_for_slave_sql_to_stop.inc:
      Refactored to use wait_for_slave_param.inc.
      Removed connection slave.
    mysql-test/include/wait_for_slave_to_start.inc:
      Refactored to use wait_for_slave_param.inc.
      Removed connection slave.
    mysql-test/include/wait_for_slave_to_stop.inc:
      Refactored to use wait_for_slave_param.inc.
      Removed connection slave.
    mysql-test/include/wait_show_pattern.inc:
      Removed unused (and error-prone) file
    mysql-test/include/wait_slave_status.inc:
      Removed unused (and error-prone) file
    mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
      Renamed $keep_connection to $slave_keep_connection.
    mysql-test/suite/rpl/t/rpl_bug26395.test:
      Replace stop slave by stop_slave.inc
    mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
      Replace start/stop slave by start_slave.inc/stop_slave.inc.
      Replace wait_for_slave_param by wait_for_slave_sql_to_stop.inc.
    mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
      Renamed $keep_connection to $slave_keep_connection.
    mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
      Replace wait_slave_status by start_slave.inc
    mysql-test/suite/rpl/t/rpl_idempotency.test:
      Added connection slave since wait_for_slave_sql_to_stop.inc does not
      do that any more.
    mysql-test/suite/rpl/t/rpl_incident.test:
      Replaced wait_for_slave_to_stop by wait_for_slave_sql_to_stop.inc
    mysql-test/suite/rpl/t/rpl_init_slave.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      Replaced save_master_pos;connection slave;sync_with_master by
      sync_slave_with_master.
    mysql-test/suite/rpl/t/rpl_log_pos.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      Replaced wait_for_slave_param by other wait_for_slave_* macros.
    mysql-test/suite/rpl/t/rpl_packet.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/suite/rpl/t/rpl_row_until.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      Replaced save_master_pos;connection slave;sync_with_master by
      sync_slave_with_master.
    mysql-test/suite/rpl/t/rpl_server_id1.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/suite/rpl/t/rpl_slave_grp_exec.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/suite/rpl/t/rpl_slave_skip.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/suite/rpl/t/rpl_slave_status.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/suite/rpl/t/rpl_sp.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/suite/rpl/t/rpl_sp_effects.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/suite/rpl/t/rpl_stm_until.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
      Replaced save_master_pos;connection slave;sync_with_master by
      sync_slave_with_master.
    mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
      Replaced start slave by start_slave.inc.
      Added explicit connection slave since wait_for_slave_sql_to_stop.inc
      does not do that anymore.
    mysql-test/t/disabled.def:
      Disabled failing test.
    mysql-test/t/func_time.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/t/grant.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/t/grant2.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/t/innodb_notembedded.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/t/log_bin_trust_function_creators_func.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
      Clean up at end of test by dropping the created user.
    mysql-test/t/query_cache.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/t/query_cache_notembedded.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    mysql-test/t/rpl_init_slave_func.test:
      Replaced start/stop slave by start_slave.inc/stop_slave.inc.
    mysql-test/t/timezone2.test:
      Restore @@global.log_bin_trust_function_creators at end of test.
    9d4ee0bf
rpl_slave_status.result 888 Bytes