diff --git a/src/box/vy_run.c b/src/box/vy_run.c index cee90458ec55bb0e8352c6d5471061068207e4b6..9aa3beec1760701f8b14db887cea870f4771d44b 100644 --- a/src/box/vy_run.c +++ b/src/box/vy_run.c @@ -152,11 +152,8 @@ vy_run_env_stop_readers(struct vy_run_env *env) { for (int i = 0; i < env->reader_pool_size; i++) { struct vy_run_reader *reader = &env->reader_pool[i]; - - cbus_stop_loop(&reader->reader_pipe); - cpipe_destroy(&reader->reader_pipe); - if (cord_join(&reader->cord) != 0) - panic("failed to join vinyl reader thread"); + tt_pthread_cancel(reader->cord.id); + tt_pthread_join(reader->cord.id, NULL); } free(env->reader_pool); } diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c index 5ec6d171ca87cf960b02cb94410a0326922b8182..d40471970d6b4cb568577ff03fbd372debfa648d 100644 --- a/src/box/vy_scheduler.c +++ b/src/box/vy_scheduler.c @@ -371,9 +371,8 @@ vy_worker_pool_stop(struct vy_worker_pool *pool) assert(pool->workers != NULL); for (int i = 0; i < pool->size; i++) { struct vy_worker *worker = &pool->workers[i]; - cbus_stop_loop(&worker->worker_pipe); - cpipe_destroy(&worker->worker_pipe); - cord_join(&worker->cord); + tt_pthread_cancel(worker->cord.id); + tt_pthread_join(worker->cord.id, NULL); } free(pool->workers); pool->workers = NULL; diff --git a/test/vinyl/errinj.result b/test/vinyl/errinj.result index 990c7e858abb5a5d1513a2c5efeef9bc78ad4055..248b32c8590a17eafa5387998c5ba420e25d4ed9 100644 --- a/test/vinyl/errinj.result +++ b/test/vinyl/errinj.result @@ -1126,3 +1126,43 @@ box.schema.user.revoke('guest', 'replication') s:drop() --- ... +-- +-- Check that tarantool stops immediately even if a vinyl worker +-- thread is blocked (see gh-3225). +-- +s = box.schema.space.create('test', {engine = 'vinyl'}) +--- +... +_ = s:create_index('pk') +--- +... +s:replace{1, 1} +--- +- [1, 1] +... +box.snapshot() +--- +- ok +... +errinj.set('ERRINJ_VY_READ_PAGE_TIMEOUT', 9000) +--- +- ok +... +_ = fiber.create(function() s:get(1) end) +--- +... +s:replace{1, 2} +--- +- [1, 2] +... +errinj.set('ERRINJ_VY_RUN_WRITE_STMT_TIMEOUT', 9000) +--- +- ok +... +_ = fiber.create(function() box.snapshot() end) +--- +... +test_run:cmd("restart server default") +box.space.test:drop() +--- +... diff --git a/test/vinyl/errinj.test.lua b/test/vinyl/errinj.test.lua index d374a9107ee0213a7b640ab7252093a5081c3ee2..eaec52a5a41c43930f3b1ef58db19c8f87ca353a 100644 --- a/test/vinyl/errinj.test.lua +++ b/test/vinyl/errinj.test.lua @@ -408,3 +408,23 @@ test_run:cmd("delete server replica") errinj.set('ERRINJ_VYRUN_INDEX_GARBAGE', false) box.schema.user.revoke('guest', 'replication') s:drop() + +-- +-- Check that tarantool stops immediately even if a vinyl worker +-- thread is blocked (see gh-3225). +-- +s = box.schema.space.create('test', {engine = 'vinyl'}) +_ = s:create_index('pk') +s:replace{1, 1} +box.snapshot() + +errinj.set('ERRINJ_VY_READ_PAGE_TIMEOUT', 9000) +_ = fiber.create(function() s:get(1) end) + +s:replace{1, 2} + +errinj.set('ERRINJ_VY_RUN_WRITE_STMT_TIMEOUT', 9000) +_ = fiber.create(function() box.snapshot() end) + +test_run:cmd("restart server default") +box.space.test:drop()