WL#12137: ENHANCE MTR TO DISABLE/ENABLE SECONDARY STORAGE ENGINE

Post-push fix.

Change-Id: I72057aba74366006289b4d3ace3e884c966b80e6

Author: Pavan Naik

client/mysqltest.cc

@@ -154,11 +154,11 @@ Expected_warnings *disabled_warnings = new Expected_warnings();
 Expected_warnings *enabled_warnings = new Expected_warnings();
 
 enum {
-  OPT_CHANGE_PROPAGATION = OPT_MAX_CLIENT_OPTION,
-  OPT_COLORED_DIFF,
+  OPT_COLORED_DIFF = OPT_MAX_CLIENT_OPTION,
   OPT_CURSOR_PROTOCOL,
   OPT_EXPLAIN_PROTOCOL,
   OPT_JSON_EXPLAIN_PROTOCOL,
+  OPT_LOAD_POOL,
   OPT_LOG_DIR,
   OPT_MARK_PROGRESS,
   OPT_MAX_CONNECT_RETRIES,
@@ -219,9 +219,9 @@ static char line_buffer[MAX_DELIMITER_LENGTH], *line_buffer_pos = line_buffer;
 static bool can_handle_expired_passwords = true;
 
 // Secondary engine options
+static const char *opt_load_pool = 0;
 static const char *opt_offload_count_file;
 static const char *opt_secondary_engine;
-static int opt_change_propagation;
 
 static Secondary_engine *secondary_engine = nullptr;
 
@@ -7177,10 +7177,6 @@ static struct my_option my_long_options[] = {
 #include "sslopt-longopts.h"
     {"basedir", 'b', "Basedir for tests.", &opt_basedir, &opt_basedir, 0,
      GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-    {"change-propagation", OPT_CHANGE_PROPAGATION,
-     "Disable/enable change propagation when secondary engine is enabled.",
-     &opt_change_propagation, &opt_change_propagation, 0, GET_INT, REQUIRED_ARG,
-     -1, -1, 1, 0, 0, 0},
     {"character-sets-dir", OPT_CHARSETS_DIR,
      "Directory for character set files.", &opt_charsets_dir, &opt_charsets_dir,
      0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -7234,6 +7230,9 @@ static struct my_option my_long_options[] = {
      "FORMAT=JSON",
      &json_explain_protocol, &json_explain_protocol, 0, GET_BOOL, NO_ARG, 0, 0,
      0, 0, 0, 0},
+    {"load-pool", OPT_LOAD_POOL, "Load pool value for secondary engine.",
+     &opt_load_pool, &opt_load_pool, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0,
+     0},
     {"logdir", OPT_LOG_DIR, "Directory for log files", &opt_logdir, &opt_logdir,
      0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
     {"mark-progress", OPT_MARK_PROGRESS,
@@ -8055,7 +8054,7 @@ static void run_query_normal(struct st_connection *cn,
   MYSQL *mysql = &cn->mysql;
   MYSQL_RES *res = 0;
 
-  if (opt_change_propagation != -1) {
+  if (opt_load_pool) {
     secondary_engine->match_statement(query, expected_errors->count());
     if (secondary_engine->statement_type()) {
       std::vector<unsigned int> ignore_errors = expected_errors->errors();
@@ -8159,7 +8158,7 @@ static void run_query_normal(struct st_connection *cn,
   // variable then can be used from the test case itself.
   var_set_errno(mysql_errno(mysql));
 
-  if (opt_change_propagation != -1 && secondary_engine->statement_type()) {
+  if (opt_load_pool && secondary_engine->statement_type()) {
     std::vector<unsigned int> ignore_errors = expected_errors->errors();
     // Run secondary engine load statements.
     if (secondary_engine->run_load_statements(mysql, ignore_errors))
@@ -8187,7 +8186,7 @@ static void run_query_stmt(MYSQL *mysql, struct st_command *command,
     cur_con->stmt = stmt;
   }
 
-  if (opt_change_propagation != -1) {
+  if (opt_load_pool) {
     secondary_engine->match_statement(query, expected_errors->count());
     if (secondary_engine->statement_type()) {
       std::vector<unsigned int> ignore_errors = expected_errors->errors();
@@ -8363,7 +8362,7 @@ static void run_query_stmt(MYSQL *mysql, struct st_command *command,
     cur_con->stmt = NULL;
   }
 
-  if (opt_change_propagation != -1 && secondary_engine->statement_type()) {
+  if (opt_load_pool && secondary_engine->statement_type()) {
     std::vector<unsigned int> ignore_errors = expected_errors->errors();
     // Run secondary engine load statements.
     if (secondary_engine->run_load_statements(mysql, ignore_errors))
@@ -9286,9 +9285,9 @@ int main(int argc, char **argv) {
     open_file(opt_include);
   }
 
-  if (opt_change_propagation != -1) {
+  if (opt_load_pool) {
     secondary_engine =
-        new Secondary_engine(opt_change_propagation, opt_secondary_engine);
+        new Secondary_engine(opt_load_pool, opt_secondary_engine);
   } else if (opt_offload_count_file) {
     secondary_engine = new Secondary_engine();
   }

client/mysqltest/secondary_engine.cc

@@ -39,13 +39,12 @@ static int offload_count_before = 0;
 
 /// Constructor function for 'Secondary_engine' class
 ///
-/// @param change_propagation Boolean flag indicating whether change
-///                           propagation is enabled or not.
-/// @param engine_name        Secondary engine name
-Secondary_engine::Secondary_engine(bool change_propagation,
+/// @param load_pool   Load pool value for secondary engine.
+/// @param engine_name Secondary engine name
+Secondary_engine::Secondary_engine(const char *load_pool,
                                    const char *engine_name)
-    : m_change_propagation(change_propagation),
-      m_engine_name(engine_name),
+    : m_engine_name(engine_name),
+      m_load_pool(load_pool),
       m_table_name(""),
       m_stmt_type(UNKNOWN_STMT),
       m_secondary_engine_errors{
@@ -364,7 +363,7 @@ void Secondary_engine::match_statement(char *statement, std::size_t errors) {
     if (match_create_statement(statement, &m_table_name)) {
       // CREATE TABLE statement
       m_stmt_type = CREATE_STMT;
-    } else if (!m_change_propagation &&
+    } else if (!std::strcmp(m_load_pool, "SNAPSHOT") &&
                match_dml_statement(statement, &m_table_name)) {
       // DML statement
       m_stmt_type = DML_STMT;

client/mysqltest/secondary_engine.h

@@ -41,7 +41,7 @@ typedef std::vector<unsigned int> Errors;
 class Secondary_engine {
  public:
   Secondary_engine() {}
-  Secondary_engine(bool change_propagation, const char *engine_name);
+  Secondary_engine(const char *load_pool, const char *engine_name);
 
   ~Secondary_engine() {}
 
@@ -129,8 +129,8 @@ class Secondary_engine {
   /// @retval True if execution of unload statement fails, false otherwise.
   bool run_secondary_unload_statement(MYSQL *mysql, Errors expected_errors);
 
-  bool m_change_propagation;
   const char *m_engine_name;
+  const char *m_load_pool;
   std::string m_table_name;
   Statement_type m_stmt_type;
 

mysql-test/lib/mtr_cases.pm

@@ -165,6 +165,12 @@ sub create_disabled_test_list($$) {
   unshift(@disabled_collection, $internal_disabled_def_file)
     if -f $internal_disabled_def_file;
 
+  # 'disabled.def' file in cloud directory.
+  $internal_disabled_def_file =
+    "$::basedir/internal/cloud/mysql-test/collections/disabled.def";
+  unshift(@disabled_collection, $internal_disabled_def_file)
+    if -f $internal_disabled_def_file;
+
   # Add 'disabled_ndb.def' to the list of disabled files if ndb is enabled.
   unshift(@disabled_collection,
           "$::glob_mysql_test_dir/collections/disabled_ndb.def")
@@ -1196,18 +1202,6 @@ sub collect_one_test_case {
     return $tinfo;
   }
 
-  if ($::secondary_engine_support and
-      defined $::opt_change_propagation and
-      defined $tinfo->{'change_propagation'}) {
-    if ($tinfo->{'change_propagation'} and !$::opt_change_propagation) {
-      skip_test($tinfo, "Test requires change propagation to be ON");
-      return $tinfo;
-    } elsif (!$tinfo->{'change_propagation'} and $::opt_change_propagation) {
-      skip_test($tinfo, "Test requires change propagation to be OFF");
-      return $tinfo;
-    }
-  }
-
   # Find config file to use if not already selected in <testname>.opt file
   if (defined $defaults_file) {
     # Using same config file for all tests
@@ -1315,8 +1309,8 @@ my @tags = (
   # option along with valgrind option.
   [ "include/no_valgrind_without_big.inc", "no_valgrind_without_big", 1 ],
 
-  [ "include/have_change_propagation_off.inc", "change_propagation", 0 ],
-  [ "include/have_change_propagation_on.inc",  "change_propagation", 1 ],);
+  [ "include/have_change_propagation_off.inc", "change-propagation", 0 ],
+  [ "include/have_change_propagation_on.inc",  "change-propagation", 1 ],);
 
 sub tags_from_test_file {
   my $tinfo = shift;

mysql-test/mysql-test-run.pl

@@ -173,7 +173,6 @@
 my %visited_suite_names;
 
 # Global variables
-our $opt_change_propagation;
 our $opt_client_dbx;
 our $opt_client_ddd;
 our $opt_client_debugger;
@@ -1428,9 +1427,6 @@ sub command_line_setup {
     # Extra options used when running test clients
     'mysqltest=s' => \@opt_extra_mysqltest_opt,
 
-    # Secondary engine options
-    'change-propagation:1' => \$opt_change_propagation,
-
     # Debugging
     'boot-dbx'             => \$opt_boot_dbx,
     'boot-ddd'             => \$opt_boot_ddd,
@@ -1670,16 +1666,6 @@ sub command_line_setup {
     mtr_error("Invalid value '$opt_test_progress' for option 'test-progress'.");
   }
 
-  if (defined $opt_change_propagation) {
-    if (!$secondary_engine_support) {
-      mtr_error("Can't use '--change-propagation' option");
-    } elsif ($opt_change_propagation < 0 or $opt_change_propagation > 1) {
-      # 'change-propagation' option value should be either 0 or 1.
-      mtr_error("Invalid value '$opt_change_propagation' for option " .
-                "'--change-propagation'.");
-    }
-  }
-
   # Read the file and store it in a string.
   if ($opt_no_skip) {
     $excluded_string = '';
@@ -5338,7 +5324,7 @@ ($$)
           my $restart_flag = 1;
           # Start secondary engine servers.
           start_secondary_engine_servers($tinfo, $restart_flag);
-          load_table_contents($mysqld) if defined $opt_change_propagation;
+          load_table_contents($mysqld) if defined $tinfo->{'load_pool'};
         }
 
         return 1;
@@ -6446,8 +6432,7 @@ ($)
     mtr_add_arg($args, "%s", $_) for @args_saved;
   }
 
-  add_secondary_engine_options($tinfo, $args, $opt_change_propagation)
-    if $tinfo->{'secondary-engine'};
+  add_secondary_engine_options($tinfo, $args) if $tinfo->{'secondary-engine'};
 
   mtr_add_arg($args, "--test-file=%s", $tinfo->{'path'});