database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-10630 rpl.rpl_mdev6020 fails in buildbot with timeout

Browse Source 
The issue was that when running with valgrind the wait for master_pos_Wait()
was not long enough.

This patch also fixes two other failures that could affect rpl_mdev6020:
- check_if_conflicting_replication_locks() didn't properly check domains
- 'did_mark_start_commit' was after signals to other threads was sent which could
  get the variable read too early.
This commit is contained in:
Monty
2016-08-22 10:16:00 +03:00
parent 5932fa7890
commit b51109693e
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/rpl_rli.cc
View File

@@ -1921,8 +1921,8 @@ rpl_group_info::mark_start_commit_no_lock()
{
if (did_mark_start_commit)
return;
mark_start_commit_inner(parallel_entry, gco, this);
did_mark_start_commit= true;
mark_start_commit_inner(parallel_entry, gco, this);
}
@@ -1933,12 +1933,12 @@ rpl_group_info::mark_start_commit()
if (did_mark_start_commit)
return;
did_mark_start_commit= true;
e= this->parallel_entry;
mysql_mutex_lock(&e->LOCK_parallel_entry);
mark_start_commit_inner(e, gco, this);
mysql_mutex_unlock(&e->LOCK_parallel_entry);
did_mark_start_commit= true;
}
@@ -1981,12 +1981,12 @@ rpl_group_info::unmark_start_commit()
if (!did_mark_start_commit)
return;
did_mark_start_commit= false;
e= this->parallel_entry;
mysql_mutex_lock(&e->LOCK_parallel_entry);
--e->count_committing_event_groups;
mysql_mutex_unlock(&e->LOCK_parallel_entry);
did_mark_start_commit= false;
}