Merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1309026 into lp:percona-server/5.6

[Sergei Glushchenko]

    Bug 1309026: server crashing, potentially thread pool related

    Cause is race condition in group commit code which leads to
    concurrent updates in PFS instrumentation while it is not designed
    to be updated concurrently. Workaround is to set thread-local
    value of PSI_thread to NULL for the follower thread while it is
    waiting for leader thread to complete commit.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/608/

Debug builds failed because of https://bugs.launchpad.net/percona-server/+bug/1323014

[Laurynas Biveinis (laurynas-biveinis)]

I wonder about the PFS instrumentation implications of the fix.

Before, PFS tracked the follower thread twice for the same time span: once for the follower thread itself, the waits on m_lock_done and m_cond_done; and at the same time, for the leader thread in the follower context, whatever is done in ha_commit_low.

With the fix, we lose m_lock_done and m_cond_done accounting?

review: Needs Information

[Sergei Glushchenko (sergei.glushchenko)]

Yes, we'll loose it. Another option is to make PFS instrumentation thread-safe, but will have impact on performance, I think.

[Laurynas Biveinis (laurynas-biveinis)]

I think it's OK to lose the m_lock_done/m_cond_done accounting until the upstream fix.

Please move down PSI_thread *psi_thread declaration to the first #ifdef HAVE_PSI_THREAD_INTERFACE block (now we'd have a new build warning if someone builds without PFS)

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Repushed

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'sql/binlog.cc'
--- sql/binlog.cc	2014-05-16 05:48:50 +0000
+++ sql/binlog.cc	2014-06-11 10:22:53 +0000
@@ -1549,6 +1549,11 @@
   */
   if (!leader)
   {
+#ifdef HAVE_PSI_THREAD_INTERFACE
+    PSI_thread *psi_thread;
+    psi_thread= PSI_THREAD_CALL(get_thread)();
+    PSI_THREAD_CALL(set_thread)(NULL);
+#endif
     mysql_mutex_lock(&m_lock_done);
 #ifndef DBUG_OFF
     /*
@@ -1564,6 +1569,9 @@
       mysql_cond_wait(&m_cond_done, &m_lock_done);
     }
     mysql_mutex_unlock(&m_lock_done);
+#ifdef HAVE_PSI_THREAD_INTERFACE
+    PSI_THREAD_CALL(set_thread)(psi_thread);
+#endif
   }
   return leader;
 }