Closed laurynas-biveinis closed 5 months ago
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
Looks like this PR has a conflict with your previous PR for following files.. mysql-test/suite/rocksdb/r/sys_tables_mysql_db.result
@laurynas-biveinis has updated the pull request. You must reimport the pull request before landing.
Interesting, I'm pretty sure I branched after the previous PR was merged. In any case, rebased
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
one typo cause auth_sec.acl_tables_row_locking failure. after fixing typo, the rocksdb.sys_tables_acl_tables_row_locking start to fail
[ 50%] rocksdb.sys_tables_acl_tables_row_locking 'innodb_ddse' [ fail ] Test ended at 2024-01-27 23:27:32
CURRENT_TEST: rocksdb.sys_tables_acl_tables_row_locking mysqltest: At line 579: Query 'REPLACE INTO mysql.user SELECT * FROM user_bk' succeeded, should have failed with error '1205' In included file mysql-test/suite/auth_sec/include/acl_tables_row_locking_test.inc: 705 included from mysql-test/suite/rocksdb/t/sys_tables_acl_tables_row_locking.test: 5
The result from queries just before the failure was: DELETE FROM mysql.user WHERE User='u2'; ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: mysql.user.PRIMARY ROLLBACK;
@laurynas-biveinis has updated the pull request. You must reimport the pull request before landing.
@luqun , ready for review.
Differences from the previous version:
ha_rocksdb::store_lock
: rearrange local variable declarations and split a long if
condition to make it easier to understandha_rocksdb::external_lock
: only downgrade DD table locks to none after no read
locking was requested. System and ACL tables are handled in store_lock
, and
external_lock
should not change their locking, add a comment to clarify that.auth_sec/include/acl_tables_row_locking_test.inc
:
ORDER BY
to the MyRocks lock info query in attempt to stabilize test outputrocksdb_lock_wait_timeout
to a low value to make test run faster because it
is testing expected lock timeouts.@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
committed
This pull request has been merged in facebook/mysql-5.6@b44c7a66af968df023a4d342d19a9ffb9d89a12d.