BUG#20980271: FIX GTID MODE TO WORK CORRECTLY IN --BOOTSTRAP/--INITIALIZE MODE

Luis Soares · Luis Soares · commit f2300ce39b97 · 2015-05-24T17:54:09.000+01:00
Patch to enable the needed GTID infrastructure when in
bootstrap mode.

The server was not starting the necessary memory structures
to setup GTIDs when on bootstrap mode. This patch makes the
server generate the auto.cnf file and set up GTID sets and
the sidmap when operating in bootstrap mode.

It also changes MTR. It needs to because the bootstrap of the
server is done once, and then the same install dir is used
for initializing the master and slave. Thence, we need to
remove the auto.cnf file (which holds the UUID generated
UUID at bootstrap time), before copying the install dir for
provisioning the new server that MTR spawns. This was not
needed before, because mysqld --initialize would not
setup the UUID for the server, i.e., the auto.cnf file.
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -3801,6 +3801,13 @@ sub mysql_install_db {
               "Could not install system database from $bootstrap_sql_file\n" .
 	      "see $path_bootstrap_log for errors");
   }
+
+  # Remove the auto.cnf so that a new auto.cnf is generated
+  # for master and slaves when the server is restarted
+  if (-f "$datadir/auto.cnf")
+  {
+    unlink "$datadir/auto.cnf";
+  }
 }
 
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -4164,10 +4164,6 @@ a file name for --log-bin-index option", opt_binlog_index_name);
   /// @todo: this looks suspicious, revisit this /sven
   enum_gtid_mode gtid_mode= get_gtid_mode(GTID_MODE_LOCK_NONE);
 
-  /* TODO: remove this. */
-  if (gtid_mode != GTID_MODE_OFF && opt_bootstrap)
-    _gtid_mode= GTID_MODE_OFF;
-
   if (gtid_mode == GTID_MODE_ON &&
       _gtid_consistency_mode != GTID_CONSISTENCY_MODE_ON)
   {
@@ -4603,158 +4599,157 @@ int mysqld_main(int argc, char **argv)
     Each server should have one UUID. We will create it automatically, if it
     does not exist.
    */
-  if (!opt_bootstrap)
+  if (init_server_auto_options())
   {
-    if (init_server_auto_options())
-    {
-      sql_print_error("Initialization of the server's UUID failed because it could"
-                      " not be read from the auto.cnf file. If this is a new"
-                      " server, the initialization failed because it was not"
-                      " possible to generate a new UUID.");
-      unireg_abort(MYSQLD_ABORT_EXIT);
-    }
+    sql_print_error("Initialization of the server's UUID failed because it could"
+                    " not be read from the auto.cnf file. If this is a new"
+                    " server, the initialization failed because it was not"
+                    " possible to generate a new UUID.");
+    unireg_abort(MYSQLD_ABORT_EXIT);
+  }
 
-    /*
-      Add server_uuid to the sid_map.  This must be done after
-      server_uuid has been initialized in init_server_auto_options and
-      after the binary log (and sid_map file) has been initialized in
-      init_server_components().
-
-      No error message is needed: init_sid_map() prints a message.
-
-      Strictly speaking, this is not currently needed when
-      opt_bin_log==0, since the variables that gtid_state->init
-      initializes are not currently used in that case.  But we call it
-      regardless to avoid possible future bugs if gtid_state ever
-      needs to do anything else.
-    */
-    global_sid_lock->rdlock();
-    int ret= gtid_state->init();
-    global_sid_lock->unlock();
-    // Initialize executed_gtids from mysql.gtid_executed table.
-    if (gtid_state->read_gtid_executed_from_table() == -1)
-      unireg_abort(1);
+  /*
+    Add server_uuid to the sid_map.  This must be done after
+    server_uuid has been initialized in init_server_auto_options and
+    after the binary log (and sid_map file) has been initialized in
+    init_server_components().
+
+    No error message is needed: init_sid_map() prints a message.
+
+    Strictly speaking, this is not currently needed when
+    opt_bin_log==0, since the variables that gtid_state->init
+    initializes are not currently used in that case.  But we call it
+    regardless to avoid possible future bugs if gtid_state ever
+    needs to do anything else.
+  */
+  global_sid_lock->rdlock();
+  int gtid_ret= gtid_state->init();
+  global_sid_lock->unlock();
 
-    if (opt_bin_log)
-    {
-      if (ret)
-        unireg_abort(MYSQLD_ABORT_EXIT);
+  if (gtid_ret)
+    unireg_abort(MYSQLD_ABORT_EXIT);
 
-      /*
-        Initialize GLOBAL.GTID_EXECUTED and GLOBAL.GTID_PURGED from
-        gtid_executed table and binlog files during server startup.
-      */
-      Gtid_set *executed_gtids=
-        const_cast<Gtid_set *>(gtid_state->get_executed_gtids());
-      Gtid_set *lost_gtids=
-        const_cast<Gtid_set *>(gtid_state->get_lost_gtids());
-      Gtid_set *gtids_only_in_table=
-        const_cast<Gtid_set *>(gtid_state->get_gtids_only_in_table());
-      Gtid_set *previous_gtids_logged=
-        const_cast<Gtid_set *>(gtid_state->get_previous_gtids_logged());
-
-      Gtid_set purged_gtids_from_binlog(global_sid_map, global_sid_lock);
-      Gtid_set gtids_in_binlog(global_sid_map, global_sid_lock);
-      Gtid_set gtids_in_binlog_not_in_table(global_sid_map, global_sid_lock);
-
-      if (mysql_bin_log.init_gtid_sets(&gtids_in_binlog,
-                                       &purged_gtids_from_binlog,
-                                       opt_master_verify_checksum,
-                                       true/*true=need lock*/,
-                                       NULL/*trx_parser*/,
-                                       NULL/*gtid_partial_trx*/,
-                                       true/*is_server_starting*/))
-        unireg_abort(MYSQLD_ABORT_EXIT);
+  // Initialize executed_gtids from mysql.gtid_executed table.
+  if (gtid_state->read_gtid_executed_from_table() == -1)
+    unireg_abort(1);
 
-      global_sid_lock->wrlock();
+  if (opt_bin_log)
+  {
+    /*
+      Initialize GLOBAL.GTID_EXECUTED and GLOBAL.GTID_PURGED from
+      gtid_executed table and binlog files during server startup.
+    */
+    Gtid_set *executed_gtids=
+      const_cast<Gtid_set *>(gtid_state->get_executed_gtids());
+    Gtid_set *lost_gtids=
+      const_cast<Gtid_set *>(gtid_state->get_lost_gtids());
+    Gtid_set *gtids_only_in_table=
+      const_cast<Gtid_set *>(gtid_state->get_gtids_only_in_table());
+    Gtid_set *previous_gtids_logged=
+      const_cast<Gtid_set *>(gtid_state->get_previous_gtids_logged());
+
+    Gtid_set purged_gtids_from_binlog(global_sid_map, global_sid_lock);
+    Gtid_set gtids_in_binlog(global_sid_map, global_sid_lock);
+    Gtid_set gtids_in_binlog_not_in_table(global_sid_map, global_sid_lock);
+
+    if (mysql_bin_log.init_gtid_sets(&gtids_in_binlog,
+                                     &purged_gtids_from_binlog,
+                                     opt_master_verify_checksum,
+                                     true/*true=need lock*/,
+                                     NULL/*trx_parser*/,
+                                     NULL/*gtid_partial_trx*/,
+                                     true/*is_server_starting*/))
+      unireg_abort(MYSQLD_ABORT_EXIT);
 
-      if (!gtids_in_binlog.is_empty() &&
-          !gtids_in_binlog.is_subset(executed_gtids))
-      {
-        gtids_in_binlog_not_in_table.add_gtid_set(&gtids_in_binlog);
-        if (!executed_gtids->is_empty())
-          gtids_in_binlog_not_in_table.remove_gtid_set(executed_gtids);
-        /*
-          Save unsaved GTIDs into gtid_executed table, in the following
-          four cases:
-            1. the upgrade case.
-            2. the case that a slave is provisioned from a backup of
-               the master and the slave is cleaned by RESET MASTER
-               and RESET SLAVE before this.
-            3. the case that no binlog rotation happened from the
-               last RESET MASTER on the server before it crashes.
-            4. The set of GTIDs of the last binlog is not saved into the
-               gtid_executed table if server crashes, so we save it into
-               gtid_executed table and executed_gtids during recovery
-               from the crash.
-        */
-        if (gtid_state->save(&gtids_in_binlog_not_in_table) == -1)
-        {
-          global_sid_lock->unlock();
-          unireg_abort(MYSQLD_ABORT_EXIT);
-        }
-        executed_gtids->add_gtid_set(&gtids_in_binlog_not_in_table);
-      }
+    global_sid_lock->wrlock();
 
-      /* gtids_only_in_table= executed_gtids - gtids_in_binlog */
-      if (gtids_only_in_table->add_gtid_set(executed_gtids) !=
-          RETURN_STATUS_OK)
-      {
-        global_sid_lock->unlock();
-        unireg_abort(MYSQLD_ABORT_EXIT);
-      }
-      gtids_only_in_table->remove_gtid_set(&gtids_in_binlog);
+    if (!gtids_in_binlog.is_empty() &&
+        !gtids_in_binlog.is_subset(executed_gtids))
+    {
+      gtids_in_binlog_not_in_table.add_gtid_set(&gtids_in_binlog);
+      if (!executed_gtids->is_empty())
+        gtids_in_binlog_not_in_table.remove_gtid_set(executed_gtids);
       /*
-        lost_gtids = executed_gtids -
-                     (gtids_in_binlog - purged_gtids_from_binlog)
-                   = gtids_only_in_table + purged_gtids_from_binlog;
+        Save unsaved GTIDs into gtid_executed table, in the following
+        four cases:
+          1. the upgrade case.
+          2. the case that a slave is provisioned from a backup of
+             the master and the slave is cleaned by RESET MASTER
+             and RESET SLAVE before this.
+          3. the case that no binlog rotation happened from the
+             last RESET MASTER on the server before it crashes.
+          4. The set of GTIDs of the last binlog is not saved into the
+             gtid_executed table if server crashes, so we save it into
+             gtid_executed table and executed_gtids during recovery
+             from the crash.
       */
-      DBUG_ASSERT(lost_gtids->is_empty());
-      if (lost_gtids->add_gtid_set(gtids_only_in_table) != RETURN_STATUS_OK ||
-          lost_gtids->add_gtid_set(&purged_gtids_from_binlog) !=
-          RETURN_STATUS_OK)
+      if (gtid_state->save(&gtids_in_binlog_not_in_table) == -1)
       {
         global_sid_lock->unlock();
         unireg_abort(MYSQLD_ABORT_EXIT);
       }
+      executed_gtids->add_gtid_set(&gtids_in_binlog_not_in_table);
+    }
 
-      /* Prepare previous_gtids_logged for next binlog */
-      if (previous_gtids_logged->add_gtid_set(&gtids_in_binlog) !=
-          RETURN_STATUS_OK)
-      {
-        global_sid_lock->unlock();
-        unireg_abort(MYSQLD_ABORT_EXIT);
-      }
+    /* gtids_only_in_table= executed_gtids - gtids_in_binlog */
+    if (gtids_only_in_table->add_gtid_set(executed_gtids) !=
+        RETURN_STATUS_OK)
+    {
+      global_sid_lock->unlock();
+      unireg_abort(MYSQLD_ABORT_EXIT);
+    }
+    gtids_only_in_table->remove_gtid_set(&gtids_in_binlog);
+    /*
+      lost_gtids = executed_gtids -
+                   (gtids_in_binlog - purged_gtids_from_binlog)
+                 = gtids_only_in_table + purged_gtids_from_binlog;
+    */
+    DBUG_ASSERT(lost_gtids->is_empty());
+    if (lost_gtids->add_gtid_set(gtids_only_in_table) != RETURN_STATUS_OK ||
+        lost_gtids->add_gtid_set(&purged_gtids_from_binlog) !=
+        RETURN_STATUS_OK)
+    {
+      global_sid_lock->unlock();
+      unireg_abort(MYSQLD_ABORT_EXIT);
+    }
 
-      /*
-        Write the previous set of gtids at this point because during
-        the creation of the binary log this is not done as we cannot
-        move the init_gtid_sets() to a place before openning the binary
-        log. This requires some investigation.
+    /* Prepare previous_gtids_logged for next binlog */
+    if (previous_gtids_logged->add_gtid_set(&gtids_in_binlog) !=
+        RETURN_STATUS_OK)
+    {
+      global_sid_lock->unlock();
+      unireg_abort(MYSQLD_ABORT_EXIT);
+    }
 
-        /Alfranio
-      */
-      Previous_gtids_log_event prev_gtids_ev(&gtids_in_binlog);
+    /*
+      Write the previous set of gtids at this point because during
+      the creation of the binary log this is not done as we cannot
+      move the init_gtid_sets() to a place before openning the binary
+      log. This requires some investigation.
 
-      global_sid_lock->unlock();
+      /Alfranio
+    */
+    Previous_gtids_log_event prev_gtids_ev(&gtids_in_binlog);
 
-      (prev_gtids_ev.common_footer)->checksum_alg=
-        static_cast<enum_binlog_checksum_alg>(binlog_checksum_options);
+    global_sid_lock->unlock();
 
-      if (prev_gtids_ev.write(mysql_bin_log.get_log_file()))
-        unireg_abort(MYSQLD_ABORT_EXIT);
-      mysql_bin_log.add_bytes_written(
-        prev_gtids_ev.common_header->data_written);
+    (prev_gtids_ev.common_footer)->checksum_alg=
+      static_cast<enum_binlog_checksum_alg>(binlog_checksum_options);
 
-      if (flush_io_cache(mysql_bin_log.get_log_file()) ||
-          mysql_file_sync(mysql_bin_log.get_log_file()->file, MYF(MY_WME)))
-        unireg_abort(MYSQLD_ABORT_EXIT);
-      mysql_bin_log.update_binlog_end_pos();
+    if (prev_gtids_ev.write(mysql_bin_log.get_log_file()))
+      unireg_abort(MYSQLD_ABORT_EXIT);
+    mysql_bin_log.add_bytes_written(
+      prev_gtids_ev.common_header->data_written);
 
-      (void) RUN_HOOK(server_state, after_engine_recovery, (NULL));
-    }
+    if (flush_io_cache(mysql_bin_log.get_log_file()) ||
+        mysql_file_sync(mysql_bin_log.get_log_file()->file, MYF(MY_WME)))
+      unireg_abort(MYSQLD_ABORT_EXIT);
+    mysql_bin_log.update_binlog_end_pos();
+
+    (void) RUN_HOOK(server_state, after_engine_recovery, (NULL));
   }
 
+
   if (init_ssl())
     unireg_abort(MYSQLD_ABORT_EXIT);
   if (network_init())

Original file line number	Diff line number	Diff line change
`@@ -3801,6 +3801,13 @@ sub mysql_install_db {`
`3801`	`3801`	`"Could not install system database from $bootstrap_sql_file\n" .`
`3802`	`3802`	`"see $path_bootstrap_log for errors");`
`3803`	`3803`	`}`
	`3804`	`+`
	`3805`	`+ # Remove the auto.cnf so that a new auto.cnf is generated`
	`3806`	`+ # for master and slaves when the server is restarted`
	`3807`	`+ if (-f "$datadir/auto.cnf")`
	`3808`	`+ {`
	`3809`	`+ unlink "$datadir/auto.cnf";`
	`3810`	`+ }`
`3804`	`3811`	`}`
`3805`	`3812`
`3806`	`3813`