Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MDEV-20848 Fixes for MTR test galera_sr.GCF-1060 #1421

Merged
merged 1 commit into from Dec 4, 2019

Conversation

sciascid
Copy link
Contributor

@sciascid sciascid commented Dec 3, 2019

This patch contains two fixes:

  • wsrep_handle_mdl_conflict(): handle the case where SR transaction
    is in aborting state. Previously, a BF-BF conflict was reported, and
    the process would abort.
  • wsrep_thd_bf_abort(): do not restore thread vars after calling
    wsrep_bf_abort(). Thread vars are already restored in wsrep-lib if
    necessary. This also removes the assumption that the caller of
    wsrep_thd_bf_abort() is the given bf_thd, which is not the case.

Also in this patch:

  • Remove unnecessary check for active victim transaction in
    wsrep_thd_bf_abort(): the exact same check is performed later in
    wsrep_bf_abort().
  • Make wsrep_thd_bf_abort() and wsrep_log_thd() const-correct.
  • Change signature of wsrep_abort_thd() to take THD pointers instead
    of void pointers.

This patch contains two fixes:

* wsrep_handle_mdl_conflict(): handle the case where SR transaction
  is in aborting state. Previously, a BF-BF conflict was reported, and
  the process would abort.
* wsrep_thd_bf_abort(): do not restore thread vars after calling
  wsrep_bf_abort(). Thread vars are already restored in wsrep-lib if
  necessary. This also removes the assumption that the caller of
  wsrep_thd_bf_abort() is the given bf_thd, which is not the case.

Also in this patch:

* Remove unnecessary check for active victim transaction in
  wsrep_thd_bf_abort(): the exact same check is performed later in
  wsrep_bf_abort().
* Make wsrep_thd_bf_abort() and wsrep_log_thd() const-correct.
* Change signature of wsrep_abort_thd() to take THD pointers instead
  of void pointers.
@claassistantio
Copy link

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@an3l an3l added this to the 10.4 milestone Dec 3, 2019
@janlindstrom janlindstrom merged commit aab6cef into MariaDB:10.4 Dec 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants