MySQL patches by Codership

Merge lp:~codership/codership-mysql/lp1358701 into lp:codership-mysql

  1. lp1358701
  2. Merge into 5.6
Proposed by Teemu Ollakka
Status: Merged
Approved by: Teemu Ollakka
Approved revision: 4136
Merged at revision: 4137
Proposed branch: lp:~codership/codership-mysql/lp1358701
Merge into: lp:codership-mysql
Diff against target: 13 lines (+2/-1)
1 file modified
sql/wsrep_applier.cc (+2/-1)
To merge this branch: bzr merge lp:~codership/codership-mysql/lp1358701
Reviewer Review Type Date Requested Status
Seppo Jaakola Approve
Review via email: mp+234695@code.launchpad.net

Description of the change

Should fix lp:1358701 - replayers should finish applying even if they have been killed.

To post a comment you must log in.
Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

The proposed fix will effectively postpone shutdown to happen after all replaying has completed. But, otoh, shutdown would be safe also before replaying, and fixing the hanging during replayer aborting would be another way to solve this issue.

Revision history for this message
Seppo Jaakola (seppo-jaakola) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sql/wsrep_applier.cc'
2--- sql/wsrep_applier.cc 2014-06-18 21:43:09 +0000
3+++ sql/wsrep_applier.cc 2014-09-15 13:49:03 +0000
4@@ -90,7 +90,8 @@
5
6 DBUG_ENTER("wsrep_apply_events");
7
8- if (thd->killed == THD::KILL_CONNECTION)
9+ if (thd->killed == THD::KILL_CONNECTION &&
10+ thd->wsrep_conflict_state != REPLAYING)
11 {
12 WSREP_INFO("applier has been aborted, skipping apply_rbr: %lld",
13 (long long) wsrep_thd_trx_seqno(thd));

Subscribers

People subscribed via source and target branches