WL#14854: Remove disconnect-slave-event-count and abort-slave-event-count

Slawomir Maludzinski · Slawomir Maludzinski · commit 18ed81713892 · 2023-08-08T08:50:02.000+02:00
Change-Id: I9a9bf05333c307d2836266e1af1dcb1656b4bc14
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
@@ -8,10 +8,6 @@ The following options may be given as the first argument:
  Also read groups with concat(group, suffix)
 --login-path=# Read this path from the login file.
 
- --abort-slave-event-count=# 
- Option used by mysql-test for debugging and testing of
- replication.This option is deprecated and will be removed
- in a future version. 
  --activate-all-roles-on-login 
  Automatically set all granted roles as active after the
  user has authenticated successfully.
@@ -339,10 +335,6 @@ The following options may be given as the first argument:
  support execution time error(s) instead of connection
  error
  (Defaults to on; use --skip-disconnect-on-expired-password to disable.)
- --disconnect-slave-event-count=# 
- Option used by mysql-test for debugging and testing of
- replication.This option is deprecated and will be removed
- in a future version.
  --div-precision-increment=# 
  Precision of the result of '/' operator will be increased
  on that value
@@ -1660,7 +1652,6 @@ The following options may be given as the first argument:
  (Defaults to on; use --skip-xa-detach-on-prepare to disable.)
 
 Variables (--variable-name=value)
-abort-slave-event-count 0
 activate-all-roles-on-login FALSE
 admin-address (No default value)
 admin-port 33062
@@ -1741,7 +1732,6 @@ delayed-insert-timeout 300
 delayed-queue-size 1000
 disabled-storage-engines 
 disconnect-on-expired-password TRUE
-disconnect-slave-event-count 0
 div-precision-increment 4
 end-markers-in-json FALSE
 enforce-gtid-consistency FALSE
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
@@ -8,10 +8,6 @@ The following options may be given as the first argument:
  Also read groups with concat(group, suffix)
 --login-path=# Read this path from the login file.
 
- --abort-slave-event-count=# 
- Option used by mysql-test for debugging and testing of
- replication.This option is deprecated and will be removed
- in a future version. 
  --activate-all-roles-on-login 
  Automatically set all granted roles as active after the
  user has authenticated successfully.
@@ -338,10 +334,6 @@ The following options may be given as the first argument:
  support execution time error(s) instead of connection
  error
  (Defaults to on; use --skip-disconnect-on-expired-password to disable.)
- --disconnect-slave-event-count=# 
- Option used by mysql-test for debugging and testing of
- replication.This option is deprecated and will be removed
- in a future version.
  --div-precision-increment=# 
  Precision of the result of '/' operator will be increased
  on that value
@@ -1671,7 +1663,6 @@ The following options may be given as the first argument:
  (Defaults to on; use --skip-xa-detach-on-prepare to disable.)
 
 Variables (--variable-name=value)
-abort-slave-event-count 0
 activate-all-roles-on-login FALSE
 admin-address (No default value)
 admin-port 33062
@@ -1751,7 +1742,6 @@ delayed-insert-timeout 300
 delayed-queue-size 1000
 disabled-storage-engines 
 disconnect-on-expired-password TRUE
-disconnect-slave-event-count 0
 div-precision-increment 4
 end-markers-in-json FALSE
 enforce-gtid-consistency FALSE
diff --git a/mysql-test/suite/engines/funcs/t/rpl000010-slave.opt b/mysql-test/suite/engines/funcs/t/rpl000010-slave.opt
diff --git a/mysql-test/suite/rpl/r/rpl_deprecations.result b/mysql-test/suite/rpl/r/rpl_deprecations.result
@@ -98,8 +98,6 @@ The syntax '--relay-log-info-repository' is deprecated and will be removed in a
 The syntax '--relay-log-info-file' is deprecated and will be removed in a future release.
 The syntax '--slave-rows-search-algorithms' is deprecated and will be removed in a future release.
 The syntax '--transaction-write-set-extraction' is deprecated and will be removed in a future release.
-The syntax '--disconnect-slave-event-count' is deprecated and will be removed in a future release.
-The syntax '--abort-slave-event-count' is deprecated and will be removed in a future release.
 The syntax '--replica-parallel-type' is deprecated and will be removed in a future release.
 The syntax '--replica-parallel-workers=0' is deprecated and will be removed in a future release. Please use '--replica-parallel-workers=1' instead.
 The syntax '--binlog-transaction-dependency-tracking' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/rpl/t/rpl_deprecations.test b/mysql-test/suite/rpl/t/rpl_deprecations.test
@@ -18,10 +18,8 @@ let $variable_names = 'master_info_repository', 'relay_log_info_repository', 're
 # WL#12926: Deprecate --log_bin_use_v1_row_events                   #
 # WL#11031: Deprecate --relay-log-info-file and --master-info-file  #
 # WL#12892: Deprecate --slave_rows_search_algorithms                #
-# WL#13958: Deprecate relay_log_info_repository                     #
-# WL#14526: Deprecate disconnect-slave-event-count                  #
-#           and abort-slave-event-count                             #
-# WL#13968: Deprecate sync_relay_log_info                           #
+# WL#13958 : Deprecate relay_log_info_repository                    #
+# WL#13968 : Deprecate sync_relay_log_info                          #
 # WL#13964: Deprecate binlog_transaction_dependency_tracking        #
 #####################################################################
 
@@ -100,7 +98,7 @@ The syntax 'log_slave_updates' is deprecated and will be removed in a future rel
 
 while($i > 0) {
   if ($i == 2) {
-    --let $rpl_server_parameters = --binlog_format=ROW --sync-relay-log-info=10005 --master-info-repository=TABLE --master-info-file=$mi_file --log-bin-use-v1-row-events --skip-replica-start --relay-log-info-repository=FILE --relay-log-info-file=$rli_file --slave-rows-search-algorithms=INDEX_SCAN,HASH_SCAN --transaction-write-set-extraction=XXHASH64 --disconnect-slave-event-count=2 --abort-slave-event-count=1 --replica-parallel-type=LOGICAL_CLOCK --replica-parallel-workers=0 --binlog-transaction-dependency-tracking=WRITESET_SESSION
+    --let $rpl_server_parameters = --binlog_format=ROW --sync-relay-log-info=10005 --master-info-repository=TABLE --master-info-file=$mi_file --log-bin-use-v1-row-events --skip-replica-start --relay-log-info-repository=FILE --relay-log-info-file=$rli_file --slave-rows-search-algorithms=INDEX_SCAN,HASH_SCAN --transaction-write-set-extraction=XXHASH64 --replica-parallel-type=LOGICAL_CLOCK --replica-parallel-workers=0 --binlog-transaction-dependency-tracking=WRITESET_SESSION
   }
 
   if ($i == 1)
@@ -162,8 +160,6 @@ while($i > 0) {
     The syntax '--relay-log-info-file' is deprecated and will be removed in a future release.
     The syntax '--slave-rows-search-algorithms' is deprecated and will be removed in a future release.
     The syntax '--transaction-write-set-extraction' is deprecated and will be removed in a future release.
-    The syntax '--disconnect-slave-event-count' is deprecated and will be removed in a future release.
-    The syntax '--abort-slave-event-count' is deprecated and will be removed in a future release.
     The syntax '--replica-parallel-type' is deprecated and will be removed in a future release.
     The syntax '--replica-parallel-workers=0' is deprecated and will be removed in a future release. Please use '--replica-parallel-workers=1' instead.
     The syntax '--binlog-transaction-dependency-tracking' is deprecated and will be removed in a future release.
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -10691,11 +10691,6 @@ struct my_option my_long_early_options[] = {
 */
 
 struct my_option my_long_options[] = {
-    {"abort-slave-event-count", OPT_ABORT_SLAVE_EVENT_COUNT,
-     "Option used by mysql-test for debugging and testing of replication."
-     "This option is deprecated and will be removed in a future version. ",
-     &abort_slave_event_count, &abort_slave_event_count, nullptr, GET_INT,
-     REQUIRED_ARG, 0, 0, 0, nullptr, 0, nullptr},
     {"allow-suspicious-udfs", 0,
      "Allows use of UDFs consisting of only one symbol xxx() "
      "without corresponding xxx_init() or xxx_deinit(). That also means "
@@ -10762,14 +10757,8 @@ struct my_option my_long_options[] = {
     {"default-time-zone", 0, "Set the default time zone.", &default_tz_name,
      &default_tz_name, nullptr, GET_STR, REQUIRED_ARG, 0, 0, 0, nullptr, 0,
      nullptr},
-    {"disconnect-slave-event-count", OPT_DISCONNECT_SLAVE_EVENT_COUNT,
-     "Option used by mysql-test for debugging and testing of replication."
-     "This option is deprecated and will be removed in a future version.",
-     &disconnect_slave_event_count, &disconnect_slave_event_count, nullptr,
-     GET_INT, REQUIRED_ARG, 0, 0, 0, nullptr, 0, nullptr},
     {"exit-info", 'T', "Used for debugging. Use at your own risk.", nullptr,
      nullptr, nullptr, GET_LONG, OPT_ARG, 0, 0, 0, nullptr, 0, nullptr},
-
     {"external-locking", 0,
      "Use system (external) locking (disabled by "
      "default).  With this option enabled you can run myisamchk to test "
@@ -12688,13 +12677,6 @@ bool mysqld_get_one_option(int optid,
       push_deprecated_warn_no_replacement(nullptr,
                                           "--transaction-write-set-extraction");
       break;
-    case OPT_DISCONNECT_SLAVE_EVENT_COUNT:
-      push_deprecated_warn_no_replacement(nullptr,
-                                          "--disconnect-slave-event-count");
-      break;
-    case OPT_ABORT_SLAVE_EVENT_COUNT:
-      push_deprecated_warn_no_replacement(nullptr, "--abort-slave-event-count");
-      break;
     case OPT_REPLICA_PARALLEL_TYPE:
       push_deprecated_warn_no_replacement(nullptr, "--replica-parallel-type");
       break;
@@ -12914,7 +12896,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr) {
       turn_bit_on;
 
   // Synchronize @@global.autocommit metadata on --autocommit
-  my_option *opt = &my_long_options[3];
+  my_option *opt = &my_long_options[2];
   assert(strcmp(opt->name, "autocommit") == 0);
   assert(opt->arg_source != nullptr);
   Sys_autocommit_ptr->set_source_name(opt->arg_source->m_path_name);
diff --git a/sql/options_mysqld.h b/sql/options_mysqld.h
@@ -126,8 +126,6 @@ enum options_mysqld {
   OPT_USE_ADMIN_SSL,
   OPT_TRANSACTION_WRITE_SET_EXTRACTION,
   OPT_SHOW_SLAVE_AUTH_INFO_DEPRECATED,
-  OPT_DISCONNECT_SLAVE_EVENT_COUNT,
-  OPT_ABORT_SLAVE_EVENT_COUNT,
   OPT_REPLICA_PARALLEL_TYPE,
   OPT_SSL_SESSION_CACHE_TIMEOUT,
   OPT_REPLICA_PARALLEL_WORKERS,
diff --git a/sql/rpl_info.h b/sql/rpl_info.h
@@ -81,10 +81,6 @@ class Rpl_info : public Slave_reporting_capability {
   std::atomic<uint> slave_running;
   std::atomic<ulong> slave_run_id;
 
-#ifndef NDEBUG
-  int events_until_exit;
-#endif
-
   /**
     Sets the persistency component/handler.
 
diff --git a/sql/rpl_replica.cc b/sql/rpl_replica.cc
@@ -230,12 +230,7 @@ const ulong mts_worker_underrun_level = 10;
 /*
   When slave thread exits, we need to remember the temporary tables so we
   can re-use them on slave start.
-
-  TODO: move the vars below under Master_info
 */
-
-int disconnect_slave_event_count = 0, abort_slave_event_count = 0;
-
 static thread_local Master_info *RPL_MASTER_INFO = nullptr;
 
 /**
@@ -4262,14 +4257,6 @@ static ulong read_event(MYSQL *mysql, MYSQL_RPL *rpl, Master_info *mi,
   DBUG_TRACE;
 
   *suppress_warnings = false;
-  /*
-    my_real_read() will time us out
-    We check if we were told to die, and if not, try reading again
-  */
-#ifndef NDEBUG
-  if (disconnect_slave_event_count && !(mi->events_until_exit--))
-    return packet_error;
-#endif
 
   if (mysql_binlog_fetch(mysql, rpl)) {
     uint err{mysql_errno(mysql)};
@@ -4904,12 +4891,7 @@ static int exec_relay_log_event(THD *thd, Relay_log_info *rli,
    */
   mysql_mutex_lock(&rli->data_lock);
 
-  Log_event *ev = nullptr;
-#ifndef NDEBUG
-  if (!abort_slave_event_count || rli->events_until_exit--)
-#endif
-    ev = in;
-
+  Log_event *ev = in;
   Log_event **ptr_ev = nullptr;
   RLI_current_event_raii rli_c_ev(rli, ev);
 
@@ -5349,10 +5331,6 @@ extern "C" void *handle_slave_io(void *arg) {
     /* Inform waiting threads that slave has started */
     mi->slave_run_id++;
 
-#ifndef NDEBUG
-    mi->events_until_exit = disconnect_slave_event_count;
-#endif
-
     thd = new THD;  // note that constructor of THD uses DBUG_ !
     THD_CHECK_SENTRY(thd);
     mi->info_thd = thd;
@@ -7000,9 +6978,6 @@ extern "C" void *handle_slave_sql(void *arg) {
     mysql_mutex_lock(&rli->run_lock);
     assert(!rli->slave_running);
     errmsg = nullptr;
-#ifndef NDEBUG
-    rli->events_until_exit = abort_slave_event_count;
-#endif
 
     thd = new THD;  // note that constructor of THD uses DBUG_ !
     thd->thread_stack = (char *)&thd;  // remember where our stack is
@@ -7481,14 +7456,6 @@ static int process_io_rotate(Master_info *mi, Rotate_log_event *rev) {
 
   if (unlikely(!rev->is_valid())) return 1;
 
-#ifndef NDEBUG
-  /*
-    If we do not do this, we will be getting the first
-    rotate event forever, so we need to not disconnect after one.
-  */
-  if (disconnect_slave_event_count) mi->events_until_exit++;
-#endif
-
   /*
     Master will send a FD event immediately after the Roate event, so don't log
     the current FD event.
@@ -8366,9 +8333,6 @@ int connect_to_master(THD *thd, MYSQL *mysql, Master_info *mi, bool reconnect,
   size_t password_size = sizeof(password);
   DBUG_TRACE;
   set_replica_max_allowed_packet(thd, mysql);
-#ifndef NDEBUG
-  mi->events_until_exit = disconnect_slave_event_count;
-#endif
   ulong client_flag = CLIENT_REMEMBER_OPTIONS;
 
   /* Always reset public key to remove cached copy */
diff --git a/sql/rpl_replica.h b/sql/rpl_replica.h
@@ -637,9 +637,6 @@ int connect_to_master(THD *thd, MYSQL *mysql, Master_info *mi, bool reconnect,
 bool net_request_file(NET *net, const char *fname);
 
 extern bool replicate_same_server_id;
-
-extern int disconnect_slave_event_count, abort_slave_event_count;
-
 /* the master variables are defaults read from my.cnf or command line */
 extern uint report_port;
 extern const char *master_info_file;
