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

Move the lock after deadlock is resolved.

Browse Source
This commit is contained in:
sensssz
2016-10-13 01:23:21 -04:00
parent 0a769b00b5
commit 183c02839f
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
storage/innobase/lock/lock0lock.cc
View File

@@ -2228,19 +2228,13 @@ lock_rec_create(
return(lock); return(lock);
} }
trx_mutex_exit(c_lock->trx); trx_mutex_exit(c_lock->trx);
} else if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS) {
lock_rec_insert_by_trx_age(lock, type_mode & LOCK_WAIT);
} else { } else {
HASH_INSERT(lock_t, hash, lock_sys->rec_hash, HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(space, page_no), lock); lock_rec_fold(space, page_no), lock);
} }
#else #else
if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS) { HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_insert_by_trx_age(lock, type_mode & LOCK_WAIT); lock_rec_fold(space, page_no), lock);
} else {
HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(space, page_no), lock);
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
if (!caller_owns_trx_mutex) { if (!caller_owns_trx_mutex) {
@@ -2371,6 +2365,13 @@ lock_rec_enqueue_waiting(
return(DB_SUCCESS_LOCKED_REC); return(DB_SUCCESS_LOCKED_REC);
} }
// Move it only when it does not cause a deadlock.
if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS) {
HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(buf_block_get_space(block), buf_block_get_page_no(block)), lock);
lock_rec_insert_by_trx_age(lock, true);
}
trx->lock.que_state = TRX_QUE_LOCK_WAIT; trx->lock.que_state = TRX_QUE_LOCK_WAIT;
trx->lock.was_chosen_as_deadlock_victim = FALSE; trx->lock.was_chosen_as_deadlock_victim = FALSE;
@@ -4225,7 +4226,8 @@ lock_get_first_lock(
} }
ut_a(lock != NULL); ut_a(lock != NULL);
ut_a(lock != ctx->wait_lock); ut_a(lock != ctx->wait_lock ||
innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS);
ut_ad(lock_get_type_low(lock) == lock_get_type_low(ctx->wait_lock)); ut_ad(lock_get_type_low(lock) == lock_get_type_low(ctx->wait_lock));
return(lock); return(lock);
@@ -6432,8 +6434,10 @@ lock_rec_queue_validate(
mode, 0, 0, block, heap_no, lock->trx)); mode, 0, 0, block, heap_no, lock->trx));
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) { } else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)
&& innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_FCFS) {
// If using VATS, it's possible that a wait lock is inserted to a place in the list
// such that it does not need to wait.
ut_a(lock_rec_has_to_wait_in_queue(lock)); ut_a(lock_rec_has_to_wait_in_queue(lock));
} }
} }

26
storage/xtradb/lock/lock0lock.cc
View File

@@ -2251,19 +2251,13 @@ lock_rec_create(
return(lock); return(lock);
} }
trx_mutex_exit(c_lock->trx); trx_mutex_exit(c_lock->trx);
} else if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS) {
lock_rec_insert_by_trx_age(lock, type_mode & LOCK_WAIT);
} else { } else {
HASH_INSERT(lock_t, hash, lock_sys->rec_hash, HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(space, page_no), lock); lock_rec_fold(space, page_no), lock);
} }
#else #else
if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS) { HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_insert_by_trx_age(lock, type_mode & LOCK_WAIT); lock_rec_fold(space, page_no), lock);
} else {
HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(space, page_no), lock);
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
lock_sys->rec_num++; lock_sys->rec_num++;
@@ -2399,6 +2393,13 @@ lock_rec_enqueue_waiting(
return(DB_SUCCESS_LOCKED_REC); return(DB_SUCCESS_LOCKED_REC);
} }
// Move it only when it does not cause a deadlock.
if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS) {
HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(buf_block_get_space(block), buf_block_get_page_no(block)), lock);
lock_rec_insert_by_trx_age(lock, true);
}
trx->lock.que_state = TRX_QUE_LOCK_WAIT; trx->lock.que_state = TRX_QUE_LOCK_WAIT;
trx->lock.was_chosen_as_deadlock_victim = FALSE; trx->lock.was_chosen_as_deadlock_victim = FALSE;
@@ -4263,7 +4264,8 @@ lock_get_first_lock(
} }
ut_a(lock != NULL); ut_a(lock != NULL);
ut_a(lock != ctx->wait_lock); ut_a(lock != ctx->wait_lock ||
innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS);
ut_ad(lock_get_type_low(lock) == lock_get_type_low(ctx->wait_lock)); ut_ad(lock_get_type_low(lock) == lock_get_type_low(ctx->wait_lock));
return(lock); return(lock);
@@ -6495,8 +6497,10 @@ lock_rec_queue_validate(
mode, 0, 0, block, heap_no, lock->trx->id)); mode, 0, 0, block, heap_no, lock->trx->id));
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) { } else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)
&& innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_FCFS) {
// If using VATS, it's possible that a wait lock is inserted to a place in the list
// such that it does not need to wait.
ut_a(lock_rec_has_to_wait_in_queue(lock)); ut_a(lock_rec_has_to_wait_in_queue(lock));
} }
} }