1. 02 Nov, 2021 2 commits
  2. 29 Oct, 2021 8 commits
    • Oleksandr Byelkin's avatar
      Merge branch '10.3' into 10.4 · 5900f3a7
      Oleksandr Byelkin authored
      5900f3a7
    • Oleksandr Byelkin's avatar
      Merge branch '10.2' into 10.3 · 6953af36
      Oleksandr Byelkin authored
      6953af36
    • sjaakola's avatar
      MDEV-23328 Server hang due to Galera lock conflict resolution · 157b3a63
      sjaakola authored
      Mutex order violation when wsrep bf thread kills a conflicting trx,
      the stack is
      
                wsrep_thd_LOCK()
                wsrep_kill_victim()
                lock_rec_other_has_conflicting()
                lock_clust_rec_read_check_and_lock()
                row_search_mvcc()
                ha_innobase::index_read()
                ha_innobase::rnd_pos()
                handler::ha_rnd_pos()
                handler::rnd_pos_by_record()
                handler::ha_rnd_pos_by_record()
                Rows_log_event::find_row()
                Update_rows_log_event::do_exec_row()
                Rows_log_event::do_apply_event()
                Log_event::apply_event()
                wsrep_apply_events()
      
      and mutexes are taken in the order
      
                lock_sys->mutex -> victim_trx->mutex -> victim_thread->LOCK_thd_data
      
      When a normal KILL statement is executed, the stack is
      
                innobase_kill_query()
                kill_handlerton()
                plugin_foreach_with_mask()
                ha_kill_query()
                THD::awake()
                kill_one_thread()
      
              and mutexes are
      
                victim_thread->LOCK_thd_data -> lock_sys->mutex -> victim_trx->mutex
      
      This patch is the plan D variant for fixing potetial mutex locking
      order exercised by BF aborting and KILL command execution.
      
      In this approach, KILL command is replicated as TOI operation.
      This guarantees total isolation for the KILL command execution
      in the first node: there is no concurrent replication applying
      and no concurrent DDL executing. Therefore there is no risk of
      BF aborting to happen in parallel with KILL command execution
      either. Potential mutex deadlocks between the different mutex
      access paths with KILL command execution and BF aborting cannot
      therefore happen.
      
      TOI replication is used, in this approach,  purely as means
      to provide isolated KILL command execution in the first node.
      KILL command should not (and must not) be applied in secondary
      nodes. In this patch, we make this sure by skipping KILL
      execution in secondary nodes, in applying phase, where we
      bail out if applier thread is trying to execute KILL command.
      This is effective, but skipping the applying of KILL command
      could happen much earlier as well.
      
      This also fixed unprotected calls to wsrep_thd_abort
      that will use wsrep_abort_transaction. This is fixed
      by holding THD::LOCK_thd_data while we abort transaction.
      Reviewed-by: default avatarJan Lindström <jan.lindstrom@mariadb.com>
      157b3a63
    • Jan Lindström's avatar
      MDEV-25114: Crash: WSREP: invalid state ROLLED_BACK (FATAL) · 30337add
      Jan Lindström authored
      Revert "MDEV-23328 Server hang due to Galera lock conflict resolution"
      
      This reverts commit 29bbcac0.
      30337add
    • sjaakola's avatar
      MDEV-23328 Server hang due to Galera lock conflict resolution · 5c230b21
      sjaakola authored
      Mutex order violation when wsrep bf thread kills a conflicting trx,
      the stack is
      
                wsrep_thd_LOCK()
                wsrep_kill_victim()
                lock_rec_other_has_conflicting()
                lock_clust_rec_read_check_and_lock()
                row_search_mvcc()
                ha_innobase::index_read()
                ha_innobase::rnd_pos()
                handler::ha_rnd_pos()
                handler::rnd_pos_by_record()
                handler::ha_rnd_pos_by_record()
                Rows_log_event::find_row()
                Update_rows_log_event::do_exec_row()
                Rows_log_event::do_apply_event()
                Log_event::apply_event()
                wsrep_apply_events()
      
      and mutexes are taken in the order
      
                lock_sys->mutex -> victim_trx->mutex -> victim_thread->LOCK_thd_data
      
      When a normal KILL statement is executed, the stack is
      
                innobase_kill_query()
                kill_handlerton()
                plugin_foreach_with_mask()
                ha_kill_query()
                THD::awake()
                kill_one_thread()
      
              and mutexes are
      
                victim_thread->LOCK_thd_data -> lock_sys->mutex -> victim_trx->mutex
      
      This patch is the plan D variant for fixing potetial mutex locking
      order exercised by BF aborting and KILL command execution.
      
      In this approach, KILL command is replicated as TOI operation.
      This guarantees total isolation for the KILL command execution
      in the first node: there is no concurrent replication applying
      and no concurrent DDL executing. Therefore there is no risk of
      BF aborting to happen in parallel with KILL command execution
      either. Potential mutex deadlocks between the different mutex
      access paths with KILL command execution and BF aborting cannot
      therefore happen.
      
      TOI replication is used, in this approach,  purely as means
      to provide isolated KILL command execution in the first node.
      KILL command should not (and must not) be applied in secondary
      nodes. In this patch, we make this sure by skipping KILL
      execution in secondary nodes, in applying phase, where we
      bail out if applier thread is trying to execute KILL command.
      This is effective, but skipping the applying of KILL command
      could happen much earlier as well.
      
      This also fixed unprotected calls to wsrep_thd_abort
      that will use wsrep_abort_transaction. This is fixed
      by holding THD::LOCK_thd_data while we abort transaction.
      Reviewed-by: default avatarJan Lindström <jan.lindstrom@mariadb.com>
      5c230b21
    • Jan Lindström's avatar
      MDEV-25114: Crash: WSREP: invalid state ROLLED_BACK (FATAL) · aa7ca987
      Jan Lindström authored
      Revert "MDEV-23328 Server hang due to Galera lock conflict resolution"
      
      This reverts commit eac8341d.
      aa7ca987
    • sjaakola's avatar
      MDEV-23328 Server hang due to Galera lock conflict resolution · db50ea3a
      sjaakola authored
      Mutex order violation when wsrep bf thread kills a conflicting trx,
      the stack is
      
                wsrep_thd_LOCK()
                wsrep_kill_victim()
                lock_rec_other_has_conflicting()
                lock_clust_rec_read_check_and_lock()
                row_search_mvcc()
                ha_innobase::index_read()
                ha_innobase::rnd_pos()
                handler::ha_rnd_pos()
                handler::rnd_pos_by_record()
                handler::ha_rnd_pos_by_record()
                Rows_log_event::find_row()
                Update_rows_log_event::do_exec_row()
                Rows_log_event::do_apply_event()
                Log_event::apply_event()
                wsrep_apply_events()
      
      and mutexes are taken in the order
      
                lock_sys->mutex -> victim_trx->mutex -> victim_thread->LOCK_thd_data
      
      When a normal KILL statement is executed, the stack is
      
                innobase_kill_query()
                kill_handlerton()
                plugin_foreach_with_mask()
                ha_kill_query()
                THD::awake()
                kill_one_thread()
      
              and mutexes are
      
                victim_thread->LOCK_thd_data -> lock_sys->mutex -> victim_trx->mutex
      
      This patch is the plan D variant for fixing potetial mutex locking
      order exercised by BF aborting and KILL command execution.
      
      In this approach, KILL command is replicated as TOI operation.
      This guarantees total isolation for the KILL command execution
      in the first node: there is no concurrent replication applying
      and no concurrent DDL executing. Therefore there is no risk of
      BF aborting to happen in parallel with KILL command execution
      either. Potential mutex deadlocks between the different mutex
      access paths with KILL command execution and BF aborting cannot
      therefore happen.
      
      TOI replication is used, in this approach,  purely as means
      to provide isolated KILL command execution in the first node.
      KILL command should not (and must not) be applied in secondary
      nodes. In this patch, we make this sure by skipping KILL
      execution in secondary nodes, in applying phase, where we
      bail out if applier thread is trying to execute KILL command.
      This is effective, but skipping the applying of KILL command
      could happen much earlier as well.
      
      This also fixed unprotected calls to wsrep_thd_abort
      that will use wsrep_abort_transaction. This is fixed
      by holding THD::LOCK_thd_data while we abort transaction.
      Reviewed-by: default avatarJan Lindström <jan.lindstrom@mariadb.com>
      db50ea3a
    • Jan Lindström's avatar
      MDEV-25114: Crash: WSREP: invalid state ROLLED_BACK (FATAL) · c8b39f7e
      Jan Lindström authored
      Revert "MDEV-23328 Server hang due to Galera lock conflict resolution"
      
      This reverts commit 29bbcac0.
      c8b39f7e
  3. 28 Oct, 2021 12 commits
  4. 27 Oct, 2021 7 commits
    • Marko Mäkelä's avatar
      MDEV-18543 fixup: Fix 32-bit builds · 772d6d34
      Marko Mäkelä authored
      772d6d34
    • Sergei Petrunia's avatar
      Fix compile warning: · 3a9967d7
      Sergei Petrunia authored
      ha_rocksdb.h:459:15: warning: 'table_type' overrides a member
      function but is not marked 'override' [-Winconsistent-missing-override]
      3a9967d7
    • Alexander Barkov's avatar
      MDEV-25402 Assertion `!str || str != Ptr' failed in String::copy · 2ed148c8
      Alexander Barkov authored
      The assert inside String::copy() prevents copying from from "str"
      if its own String::Ptr also points to the same memory.
      
      The idea of the assert is that copy() performs memory reallocation,
      and this reallocation can free (and thus invalidate) the memory pointed by Ptr,
      which can lead to further copying from a freed memory.
      
      The assert was incomplete: copy() can free the memory pointed by its Ptr
      only if String::alloced is true!
      
      If the String is not alloced, it is still safe to copy even from
      the location pointed by Ptr.
      
      This scenario demonstrates a safe copy():
        const char *tmp= "123";
        String str1(tmp, 3);
        String str2(tmp, 3);
        // This statement is safe:
        str2.copy(str1->ptr(), str1->length(), str1->charset(), cs_to, &errors);
      
      Inside the copy() the parameter "str" is equal to String::Ptr in this example.
      But it's still ok to reallocate the memory for str2, because str2
      was a constant before the copy() call. Thus reallocation does not
      make the memory pointed by str1->ptr() invalid.
      
      Adjusting the assert condition to allow copying for constant strings.
      2ed148c8
    • Marko Mäkelä's avatar
      Fix tests for PLUGIN_PARTITION=NO · 4b8340d8
      Marko Mäkelä authored
      4b8340d8
    • Alexander Barkov's avatar
      05a0eae3
    • Alexander Barkov's avatar
      7b752429
    • Alexander Barkov's avatar
      MDEV-22380: Assertion `name.length == strlen(name.str)' failed ... · e97b785d
      Alexander Barkov authored
      Also fixes:
      MDEV-25399 Assertion `name.length == strlen(name.str)' failed in Item_func_sp::make_send_field
      
      Also fixes a problem that in this scenario:
      
      SET NAMES binary;
      SELECT 'some not well-formed utf8 string';
      
      the auto-generated column name copied the binary string value directly
      to the Item name, without checking utf8 well-formedness.
      
      After this change auto-generated column names work as follows:
      - Zero bytes 0x00 are copied to the name using HEX notation
      - In case of "SET NAMES binary", all bytes sequences that do not make
        well-formed utf8 characters are copied to the name using HEX notation.
      e97b785d
  5. 26 Oct, 2021 7 commits
    • Eugene Kosov's avatar
      MDEV-18543 IMPORT TABLESPACE fails after instant DROP COLUMN · d74d9596
      Eugene Kosov authored
      ALTER TABLE IMPORT doesn't properly handle instant alter metadata.
      This patch makes IMPORT read, parse and apply instant alter metadata at the
      very beginning of operation. So, cases when source table has some metadata
      and destination table doesn't have it now works fine.
      
      DISCARD already removes instant metadata so importing normal table into
      instant table worked fine before this patch.
      
      decrypt_decompress(): decrypts and decompresses page if needed
      
      handle_instant_metadata(): this should be the first thing to read source
      table. Basically, it applies instant metadata to a destination
      dict_table_t object. This is the first thing to read FSP flags so
      all possible checks of it were moved to this function.
      
      PageConverter::update_index_page(): it doesn't now read instant metadata.
      This logic were moved into handle_instant_metadata()
      
      row_import::match_flags(): this is a first part row_import::match_schema().
      As a separate function it's used by handle_instant_metadata().
      
      fil_space_t::is_full_crc32_compressed(): added convenient function
      
      ha_innobase::discard_or_import_tablespace(): do not reload table definition
      to read instant metadata because handle_instant_metadata() does it better.
      The reverted code was originally added in
      4e7ee166
      
      ANONYMOUS_VAR: this is a handy thing to use along with make_scope_exit()
      
      full_crc32_import.test shows different results, because no
      dict_table_close() and dict_table_open_on_id() happens.
      Thus, SHOW CREATE TABLE shows a little bit older table definition.
      d74d9596
    • Diego Dupin's avatar
      MDEV-26868: Session tracking flag in OK_PACKET · d062b690
      Diego Dupin authored
      Take into account client capabilities.
      d062b690
    • Oleksandr Byelkin's avatar
    • Oleksandr Byelkin's avatar
      Safemalloc typo fix found by clang. · 1fb4537e
      Oleksandr Byelkin authored
      1fb4537e
    • Vladislav Vaintroub's avatar
      Try to fix appveyor to prevent occasional failing of mysql_client_test · 20848007
      Vladislav Vaintroub authored
      Sometimes, although not often, it would timeout after 3 minutes.
      20848007
    • Vladislav Vaintroub's avatar
      MDEV-23391 Crash/assertion CREATE OR REPLACE TABLE AS SELECT under LOCK TABLE · 6211c355
      Vladislav Vaintroub authored
      Happens with Innodb engine.
      
      Move unlock_locked_table() past drop_open_table(), and
      rollback current statement, so that we can actually unlock the table.
      
      Anything else results in assertions, in drop, or unlock, or in close_table.
      6211c355
    • Thirunarayanan Balathandayuthapani's avatar
      MDEV-26902 Auxilary fts table evicts during DDL · 81b85476
      Thirunarayanan Balathandayuthapani authored
      MDEV-25702(commit 696de6d0) should've
      closed the fts table further. This patch closes the table after
      finishing the bulk insert operation.
      81b85476
  6. 25 Oct, 2021 4 commits