database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

refs #7 - handling lock queue granting in BF-BF conflict situation

Browse Source
This commit is contained in:
sjaakola
2014-11-16 16:26:36 +02:00
committed by Nirbhay Choubey
parent 51744b3f80
commit 68fe3a39ac
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
storage/innobase/lock/lock0lock.c
View File

@@ -982,14 +982,15 @@ lock_rec_has_to_wait(
}
#ifdef WITH_WSREP
/* if BF thread is locking and has conflict with another BF
/* if BF thread has conflict with another BF
thread, we need to look at trx ordering and lock types */
if (for_locking &&
wsrep_thd_is_BF(trx->mysql_thd, FALSE) &&
if (wsrep_thd_is_BF(trx->mysql_thd, FALSE) &&
wsrep_thd_is_BF(lock2->trx->mysql_thd, TRUE)) {
if (wsrep_debug) {
fprintf(stderr, "\n BF-BF lock conflict \n");
fprintf(stderr,
"BF-BF lock conflict, locking: %d \n",
for_locking);
lock_rec_print(stderr, lock2);
}
@@ -998,10 +999,17 @@ lock_rec_has_to_wait(
(type_mode & LOCK_MODE_MASK) == LOCK_X &&
(lock2->type_mode & LOCK_MODE_MASK) == LOCK_X)
{
/* exclusive lock conflicts are not accepted */
fprintf(stderr, "BF-BF X lock conflict\n");
lock_rec_print(stderr, lock2);
abort();
if (for_locking) {
/* exclusive lock conflicts are not
accepted */
fprintf(stderr,
"BF-BF X lock conflict\n");
lock_rec_print(stderr, lock2);
abort();
} else if (wsrep_debug) {
fprintf(stderr,
"BF-BF X lock conflict\n");
}
} else {
/* if lock2->index->n_uniq <=
lock2->index->n_user_defined_cols