- commits - lists.mariadb.org

[Commits] 391b7f5bd19: Fix typo.
by jan 04 Oct '18

04 Oct '18

revision-id: 391b7f5bd190c3fcbaedf1128a6bc3e7f9981efe (mariadb-10.1.35-75-g391b7f5bd19) parent(s): e2a1c58582ac25af0af0621a2c32d822a5e9cecc author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-04 08:04:55 +0300 message: Fix typo. --- mysql-test/suite/galera/disabled.def | 2 +- mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 9a686b560b2..464ed6444f9 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -33,4 +33,4 @@ galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan -galera_pic_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index 6ae2079577f..c48ddc66bdf 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -41,10 +41,11 @@ SET GLOBAL wsrep_cluster_address = @wsrep_cluster_address_orig; --connection node_2 --source include/start_mysqld.inc + +--connection node_1 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' --source include/wait_condition.inc ---connection node_1 SET GLOBAL wsrep_provider_options = @wsrep_provider_options_orig; # Restore original auto_increment_offset values.

1 0

[Commits] 0d302102ae0: Disable.
by jan 04 Oct '18

04 Oct '18

revision-id: 0d302102ae0ddc886a1472e4f06536b4ce67788e (mariadb-10.1.35-77-g0d302102ae0) parent(s): 36cadd41d172022d87bff282f04d3b99a0fcf0d0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-04 07:11:52 +0300 message: Disable. --- mysql-test/suite/galera/disabled.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 92e45cc0f25..9a686b560b2 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -33,4 +33,4 @@ galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan - +galera_pic_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb

1 0

[Commits] 36cadd41d17: Add one more wait so that both nodes are up before environment
by jan 03 Oct '18

03 Oct '18

revision-id: 36cadd41d172022d87bff282f04d3b99a0fcf0d0 (mariadb-10.1.35-76-g36cadd41d17) parent(s): 880820f977c84f44a8155bc0f929138b95e0a9d3 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 17:56:02 +0300 message: Add one more wait so that both nodes are up before environment reset. --- mysql-test/suite/galera/r/galera_pc_ignore_sb.result | 4 ++++ mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result index ca0b260fb0c..81892a6cb38 100644 --- a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result +++ b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result @@ -1,3 +1,5 @@ +SET @wsrep_cluster_address_orig = @@GLOBAL.wsrep_cluster_address; +SET @wsrep_provider_options_orig = @@GLOBAL.wsrep_provider_options; SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true'; Killing server ... CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; @@ -10,3 +12,5 @@ SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL VARIABLE_VALUE = 'ON' 1 SET GLOBAL wsrep_cluster_address = ''; +SET GLOBAL wsrep_cluster_address = @wsrep_cluster_address_orig; +SET GLOBAL wsrep_provider_options = @wsrep_provider_options_orig; diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index c45f3256d78..6ae2079577f 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -11,8 +11,8 @@ --source include/auto_increment_offset_save.inc --connection node_1 ---let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address` ---let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` +SET @wsrep_cluster_address_orig = @@GLOBAL.wsrep_cluster_address; +SET @wsrep_provider_options_orig = @@GLOBAL.wsrep_provider_options; --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' --source include/wait_condition.inc @@ -36,14 +36,17 @@ SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL # Reset the master and restart the slave so that post-test checks can run SET GLOBAL wsrep_cluster_address = ''; ---disable_query_log ---eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig'; ---eval SET GLOBAL wsrep_provider_options ='$wsrep_provider_options_orig'; ---enable_query_log +SET GLOBAL wsrep_cluster_address = @wsrep_cluster_address_orig; --connection node_2 --source include/start_mysqld.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +--connection node_1 +SET GLOBAL wsrep_provider_options = @wsrep_provider_options_orig; + # Restore original auto_increment_offset values. --source include/auto_increment_offset_restore.inc

1 0

[Commits] 0f97f6b8398: MDEV-17346 parallel slave start and stop races to workers disappeared
by andrei.elkin＠pp.inet.fi 03 Oct '18

03 Oct '18

revision-id: 0f97f6b8398054ccb0507fbacc76c9deeddd47a4 (mariadb-10.1.35-71-g0f97f6b8398) parent(s): 1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-10-03 15:42:12 +0300 message: MDEV-17346 parallel slave start and stop races to workers disappeared The bug appears as a slave SQL thread hanging in rpl_parallel_thread_pool::get_thread() while there are no slave worker threads to awake it. The hang could occur at parallel slave worker pool activation by a "new" started SQL thread when the pool was concurrently deactivated by being terminated "old" SQL thread. At reading the current pool size the SQL thread did not employ necessary protection designed by MDEV-9573. The pool can't be deactivated when there is an active slave but the "new" slave might set its active status too late while seeing the pool still non-empty. The end product of four computaional events Old_slave:any_slave_sql_running() => 0 New_slave:slave_running= "active" New_slave:global_rpl_thread_pool.size > 0 => true Old_slave:global_rpl_thread_pool.size := 0 could led to the observed hang. The new SQL thread proceeds to scheduling having all workers gone. Fixed with making the SQL thread at the pool activation first to grab the same lock as potential deactivator also does prior to destroy the pool. --- sql/rpl_parallel.cc | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 35cddee6d4d..8fef2d66635 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -1617,13 +1617,32 @@ int rpl_parallel_resize_pool_if_no_slaves(void) } +/** + Pool activation is preceeded by taking a "lock" of pool_mark_busy + which guarantees the number of running slaves drops to zero atomicly + with the number of pool workers. + This resolves race between the function caller thread and one + that may be attempting to deactivate the pool. +*/ int rpl_parallel_activate_pool(rpl_parallel_thread_pool *pool) { + int rc= 0; + + if ((rc= pool_mark_busy(pool, current_thd))) + return rc; // killed + if (!pool->count) - return rpl_parallel_change_thread_count(pool, opt_slave_parallel_threads, - 0); - return 0; + { + pool_mark_not_busy(pool); + rc= rpl_parallel_change_thread_count(pool, opt_slave_parallel_threads, + 0); + } + else + { + pool_mark_not_busy(pool); + } + return rc; }

1 0

[Commits] 880820f977c: Add wait until cluster has correct number of nodes.
by jan 03 Oct '18

03 Oct '18

revision-id: 880820f977c84f44a8155bc0f929138b95e0a9d3 (mariadb-10.1.35-75-g880820f977c) parent(s): 6dff1cfdca947315c0857074c3e9ca075402f90c author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 13:45:05 +0300 message: Add wait until cluster has correct number of nodes. --- mysql-test/suite/galera/r/galera_pc_ignore_sb.result | 2 +- mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result index 5fcccfe2d59..ca0b260fb0c 100644 --- a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result +++ b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result @@ -1,4 +1,4 @@ -SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; +SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true'; Killing server ... CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index 60efb88906f..c45f3256d78 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -14,7 +14,10 @@ --let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address` --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` -SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true'; --connection node_2 --source include/kill_galera.inc

1 0

[Commits] b173e883f7f: MDEV-16656: DROP DATABASE crashes the Galera Cluster
by jan 03 Oct '18

03 Oct '18

revision-id: b173e883f7fd4929c1504db69c09feb6d8fca2ed (mariadb-10.1.35-75-gb173e883f7f) parent(s): 6dff1cfdca947315c0857074c3e9ca075402f90c author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 10:24:33 +0300 message: MDEV-16656: DROP DATABASE crashes the Galera Cluster Restore incorrectly removed call fts_sql_rollback(trx_rename); --- storage/innobase/fts/fts0fts.cc | 1 + storage/xtradb/fts/fts0fts.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 04aaff96b91..4aeb2746d48 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -6665,6 +6665,7 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); + fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt; diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index d5128955f56..cc7f4f20267 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -6664,6 +6664,7 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); + fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt;

1 0

[Commits] 6dff1cfdca9: Fix test failure on wsrep.variables
by jan 03 Oct '18

03 Oct '18

revision-id: 6dff1cfdca947315c0857074c3e9ca075402f90c (mariadb-10.1.35-74-g6dff1cfdca9) parent(s): 87ecddcbdffbd3a221b38b4e8ab7e06af0af52a1 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 08:58:23 +0300 message: Fix test failure on wsrep.variables SLES11 can't build currently latest Galera library version. --- mysql-test/suite/wsrep/t/variables.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 15104b9b654..1a2ab2579a5 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -30,7 +30,7 @@ CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*") --disable_result_log --disable_query_log eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; ---let $galera_version=25.3.17 +--let $galera_version=25.3.24 source include/check_galera_version.inc; --enable_result_log --enable_query_log

1 0

[Commits] 87ecddcbdff: MDEV-17357: Test failure on galera.galera_pc_ignore_sb
by jan 03 Oct '18

03 Oct '18

revision-id: 87ecddcbdffbd3a221b38b4e8ab7e06af0af52a1 (mariadb-10.1.35-73-g87ecddcbdff) parent(s): 649451ae0d4c57aa524ab7ced18deb6f6621e466 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 08:49:57 +0300 message: MDEV-17357: Test failure on galera.galera_pc_ignore_sb Fix incorrect wsrep_provider_options set. --- mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index f24ca5cd25b..60efb88906f 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -35,7 +35,7 @@ SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL SET GLOBAL wsrep_cluster_address = ''; --disable_query_log --eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig'; ---eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig'; +--eval SET GLOBAL wsrep_provider_options ='$wsrep_provider_options_orig'; --enable_query_log --connection node_2

1 0

[Commits] aaa8e2b: Getting tests to pass with range locking
by psergey＠askmonty.org 24 Sep '18

24 Sep '18

revision-id: aaa8e2bf45cdebcbbb10fb33e87503a2f4064c33 parent(s): da9a1d55dc38e76ec6d87ab5248349db0038d559 committer: Sergei Petrunia branch nick: mysql-5.6-rocksdb-rangelocking2 timestamp: 2018-09-24 17:48:33 +0300 message: Getting tests to pass with range locking - Set lock wait timeout correctly - Make waits KILL-able with KILL command --- rocksdb | 2 +- storage/rocksdb/ha_rocksdb.cc | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index 2fa28d5..d629f93 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 2fa28d505b745ffbac9235e4b8f235202bc75b69 +Subproject commit d629f934d907f506bd114d9d48852e6570d333da diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index ed9a57b..94baf27 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -4199,6 +4199,28 @@ static int rocksdb_start_tx_and_assign_read_view( return HA_EXIT_SUCCESS; } + +static void +rocksdb_kill_connection(handlerton* hton, + THD* thd) +{ + //TODO: db_env->kill_waiter(db_env, thd); + // locktree_manager::kill_waiter(void *extra) + Rdb_transaction *const tx = get_tx_from_thd(thd); + + // tx can be zero if that thread doesn't have a RocksDB transaction + // TODO: how do we know if things that are done in this function are + // thread-safe? e.g. the transaction doesn't disappear while execution + // is right on this line? + if (tx && !tx->is_writebatch_trx()) + { + Rdb_transaction_impl *tx_impl= (Rdb_transaction_impl*) tx; + const rocksdb::Transaction *rdb_trx = tx_impl->get_rdb_trx(); + rdb->KillLockWait((void*)rdb_trx->GetID()); + } +} + + static int rocksdb_start_tx_with_shared_read_view( handlerton *const hton, /*!< in: RocksDB handlerton */ THD *const thd, /*!< in: MySQL thread handle of the @@ -4538,6 +4560,8 @@ static int rocksdb_init_func(void *const p) { rocksdb_hton->update_table_stats = rocksdb_update_table_stats; rocksdb_hton->flush_logs = rocksdb_flush_wal; + rocksdb_hton->kill_connection= rocksdb_kill_connection; + rocksdb_hton->flags = HTON_TEMPORARY_NOT_SUPPORTED | HTON_SUPPORTS_EXTENDED_KEYS | HTON_CAN_RECREATE;

1 0

[Commits] d629f93: Getting tests to pass with range locking
by psergey＠askmonty.org 24 Sep '18

24 Sep '18

revision-id: d629f934d907f506bd114d9d48852e6570d333da parent(s): 2fa28d505b745ffbac9235e4b8f235202bc75b69 committer: Sergei Petrunia branch nick: modules timestamp: 2018-09-24 17:45:11 +0300 message: Getting tests to pass with range locking - Set lock wait timeout correctly - Make waits KILL-able with KILL command --- include/rocksdb/utilities/transaction_db.h | 2 ++ utilities/transactions/pessimistic_transaction_db.cc | 1 - utilities/transactions/pessimistic_transaction_db.h | 5 +++++ utilities/transactions/transaction_lock_mgr.cc | 18 +++++++++++++----- utilities/transactions/transaction_lock_mgr.h | 2 ++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/include/rocksdb/utilities/transaction_db.h b/include/rocksdb/utilities/transaction_db.h index 1cf205e..415544e 100644 --- a/include/rocksdb/utilities/transaction_db.h +++ b/include/rocksdb/utilities/transaction_db.h @@ -259,6 +259,8 @@ class TransactionDB : public StackableDB { // psergey-TODO: move this elsewhere. bool use_range_locking; + + virtual void KillLockWait(void *cdata){}; protected: // To Create an TransactionDB, call Open() // The ownership of db is transferred to the base StackableDB diff --git a/utilities/transactions/pessimistic_transaction_db.cc b/utilities/transactions/pessimistic_transaction_db.cc index 0c8428b..dcc420a 100644 --- a/utilities/transactions/pessimistic_transaction_db.cc +++ b/utilities/transactions/pessimistic_transaction_db.cc @@ -373,7 +373,6 @@ Status PessimisticTransactionDB::TryLock(PessimisticTransaction* txn, uint32_t cfh_id, const std::string& key, bool exclusive) { - //fprintf(stderr, "AAA: PessimisticTransactionDB::TryLock calling extra lock\n"); if (use_range_locking) return range_lock_mgr_.TryLock(txn, cfh_id, key, GetEnv(), exclusive); else diff --git a/utilities/transactions/pessimistic_transaction_db.h b/utilities/transactions/pessimistic_transaction_db.h index 17becf1..1876de5 100644 --- a/utilities/transactions/pessimistic_transaction_db.h +++ b/utilities/transactions/pessimistic_transaction_db.h @@ -122,6 +122,11 @@ class PessimisticTransactionDB : public TransactionDB { virtual void UpdateCFComparatorMap(const std::vector<ColumnFamilyHandle*>&) {} virtual void UpdateCFComparatorMap(ColumnFamilyHandle*) {} + void KillLockWait(void *cdata) override + { + if (use_range_locking) + range_lock_mgr_.KillLockWait(cdata); + } protected: DBImpl* db_impl_; std::shared_ptr<Logger> info_log_; diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 476b9fc..0ce5124 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -315,6 +315,10 @@ Status TransactionLockMgr::TryLock(PessimisticTransaction* txn, timeout, lock_info); } +void RangeLockMgr::KillLockWait(void *cdata) +{ + ltm.kill_waiter(cdata); +} // psergey: new code: // (TODO: the below ignores column_family_id !) @@ -328,10 +332,14 @@ Status RangeLockMgr::TryLock(PessimisticTransaction* txn, toku_fill_dbt(&key_dbt, key.data(), key.size()); request.set(lt, txn->GetID(), &key_dbt, &key_dbt, toku::lock_request::WRITE, - false /* not a big txn */, nullptr /*client_extra*/); + false /* not a big txn */, (void*)txn->GetID() /*client_extra*/); - const uint64_t wait_time_msec=1000*1000*1000; - const uint64_t killed_time_msec=1000*1000*1000; + uint64_t killed_time_msec = 0; // TODO: what should this have? + uint64_t wait_time_msec = txn->GetLockTimeout(); + // convert microseconds to milliseconds + if (wait_time_msec != (uint64_t)-1) + wait_time_msec = (wait_time_msec + 500) / 1000; + request.start(); const int r = request.wait(wait_time_msec, killed_time_msec, nullptr, /* killed_callback */ @@ -700,7 +708,7 @@ another_lock_mgr_release_lock_int(toku::locktree *lt, void RangeLockMgr::UnLock(PessimisticTransaction* txn, uint32_t column_family_id, const std::string& key, Env* env) { - fprintf(stderr, "RangeLockMgr::UnLock (key)\n"); + //fprintf(stderr, "RangeLockMgr::UnLock (key)\n"); another_lock_mgr_release_lock_int(lt, txn, column_family_id, key); toku::lock_request::retry_all_lock_requests(lt, nullptr /* lock_wait_needed_callback */); } @@ -708,7 +716,7 @@ void RangeLockMgr::UnLock(PessimisticTransaction* txn, void RangeLockMgr::UnLock(const PessimisticTransaction* txn, const TransactionKeyMap* key_map, Env* env) { - fprintf(stderr, "RangeLockMgr::UnLock(key_map)\n"); + //fprintf(stderr, "RangeLockMgr::UnLock(key_map)\n"); for (auto& key_map_iter : *key_map) { diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index c6ef954..3580441 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -105,6 +105,8 @@ class RangeLockMgr :public BaseLockMgr { } + void KillLockWait(void *cdata); + private: toku::locktree_manager ltm; toku::locktree *lt; // only one tree for now

1 0