From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, olegrok@tarantool.org, yaroslav.dynnikov@tarantool.org Subject: [Tarantool-patches] [PATCH vshard 06/11] util: introduce fiber_is_self_canceled() Date: Tue, 23 Feb 2021 01:15:44 +0100 [thread overview] Message-ID: <dfb6f216e5d09655247f53c165a758c97b9225a1.1614039039.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1614039039.git.v.shpilevoy@tarantool.org> Original fiber.testcancel() has an issue - it is not exception-safe. This makes it unusable for code which wants to do cleanup before cancellation. The patch introduces util.fiber_is_self_canceled() which checks if the current fiber is canceled but returns true/false instead of throwing an error. The patch is going to be used in the map-reduce patches where it will be necessary to check if the fiber is canceled. And if it is - perform cleanup and quit whatever the code was doing. Part of #147 --- test/unit/util.result | 28 ++++++++++++++++++++++++++++ test/unit/util.test.lua | 14 ++++++++++++++ vshard/util.lua | 8 ++++++++ 3 files changed, 50 insertions(+) diff --git a/test/unit/util.result b/test/unit/util.result index 679c087..c83e80c 100644 --- a/test/unit/util.result +++ b/test/unit/util.result @@ -266,3 +266,31 @@ assert(type(err) == 'table') --- - true ... +-- +-- Exception-safe fiber cancel check. +-- +self_is_canceled = util.fiber_is_self_canceled +--- +... +assert(not self_is_canceled()) +--- +- true +... +ok = nil +--- +... +_ = fiber.create(function() \ + local f = fiber.self() \ + pcall(f.cancel, f) \ + ok = self_is_canceled() \ +end) +--- +... +test_run:wait_cond(function() return ok ~= nil end) +--- +- true +... +assert(ok) +--- +- true +... diff --git a/test/unit/util.test.lua b/test/unit/util.test.lua index df3db6f..881feb4 100644 --- a/test/unit/util.test.lua +++ b/test/unit/util.test.lua @@ -107,3 +107,17 @@ _ = test_run:wait_cond(function() return ok or err end) assert(not ok) err.message assert(type(err) == 'table') + +-- +-- Exception-safe fiber cancel check. +-- +self_is_canceled = util.fiber_is_self_canceled +assert(not self_is_canceled()) +ok = nil +_ = fiber.create(function() \ + local f = fiber.self() \ + pcall(f.cancel, f) \ + ok = self_is_canceled() \ +end) +test_run:wait_cond(function() return ok ~= nil end) +assert(ok) diff --git a/vshard/util.lua b/vshard/util.lua index d78f3a5..30a1e6e 100644 --- a/vshard/util.lua +++ b/vshard/util.lua @@ -225,6 +225,13 @@ local function fiber_cond_wait(cond, timeout) return nil, lerror.make(err) end +-- +-- Exception-safe way to check if the current fiber is canceled. +-- +local function fiber_is_self_canceled() + return not pcall(fiber.testcancel) +end + return { tuple_extract_key = tuple_extract_key, reloadable_fiber_create = reloadable_fiber_create, @@ -235,4 +242,5 @@ return { table_copy_yield = table_copy_yield, table_minus_yield = table_minus_yield, fiber_cond_wait = fiber_cond_wait, + fiber_is_self_canceled = fiber_is_self_canceled, } -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-02-23 0:19 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-23 0:15 [Tarantool-patches] [PATCH vshard 00/11] VShard Map-Reduce, part 2: Ref, Sched, Map Vladislav Shpilevoy via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 01/11] error: introduce vshard.error.timeout() Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:27 ` Oleg Babin via Tarantool-patches 2021-02-24 21:46 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 12:42 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 10/11] sched: introduce vshard.storage.sched module Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:28 ` Oleg Babin via Tarantool-patches 2021-02-24 21:50 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-04 21:02 ` Oleg Babin via Tarantool-patches 2021-03-05 22:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-09 8:03 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 11/11] router: introduce map_callrw() Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:28 ` Oleg Babin via Tarantool-patches 2021-02-24 22:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 12:43 ` Oleg Babin via Tarantool-patches 2021-02-26 23:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-01 10:58 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 02/11] storage: add helper for local functions invocation Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:27 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 03/11] storage: cache bucket count Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:27 ` Oleg Babin via Tarantool-patches 2021-02-24 21:47 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 12:42 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 04/11] registry: module for circular deps resolution Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:27 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 05/11] util: introduce safe fiber_cond_wait() Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:27 ` Oleg Babin via Tarantool-patches 2021-02-24 21:48 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 12:42 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-02-24 10:27 ` [Tarantool-patches] [PATCH vshard 06/11] util: introduce fiber_is_self_canceled() Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 07/11] storage: introduce bucket_generation_wait() Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:27 ` Oleg Babin via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 08/11] storage: introduce bucket_are_all_rw() Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:27 ` Oleg Babin via Tarantool-patches 2021-02-24 21:48 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-23 0:15 ` [Tarantool-patches] [PATCH vshard 09/11] ref: introduce vshard.storage.ref module Vladislav Shpilevoy via Tarantool-patches 2021-02-24 10:28 ` Oleg Babin via Tarantool-patches 2021-02-24 21:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 12:42 ` Oleg Babin via Tarantool-patches 2021-03-04 21:22 ` Oleg Babin via Tarantool-patches 2021-03-05 22:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-09 8:03 ` Oleg Babin via Tarantool-patches 2021-03-21 18:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-12 23:13 ` [Tarantool-patches] [PATCH vshard 00/11] VShard Map-Reduce, part 2: Ref, Sched, Map Vladislav Shpilevoy via Tarantool-patches 2021-03-15 7:05 ` Oleg Babin via Tarantool-patches 2021-03-28 18:17 ` Vladislav Shpilevoy via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=dfb6f216e5d09655247f53c165a758c97b9225a1.1614039039.git.v.shpilevoy@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=olegrok@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --cc=yaroslav.dynnikov@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH vshard 06/11] util: introduce fiber_is_self_canceled()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox