abstract: make fibers cancellable #224
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LeonidVas
requested changes
Jan 29, 2024
| @@ -169,7 +169,7 @@ local function utubettl_fiber(self) | |||
| if box.info.ro == false then | |||
| local stat, err = pcall(utubettl_fiber_iteration, self, processed) | |||
|
|
|||
| if not stat and not err.code == box.error.READONLY then | |||
| if not stat and not (err.code == box.error.READONLY) then | |||
There was a problem hiding this comment.
Please move this to a separate commit.
queue/abstract/queue_state.lua
Outdated
| current = queue_state.states.RUNNING | ||
| log.info('Queue state changed: RUNNING') | ||
| end | ||
| box.ctl.wait_rw() |
There was a problem hiding this comment.
If I understand correctly, we can keep calling with pcall and in case of an error write a message to the log, check if fiber is canceled and then throw a new error with more additional context. If this is the case, I prefer to do the extra processing.
There was a problem hiding this comment.
Changed to:
--- a/queue/abstract/queue_state.lua
+++ b/queue/abstract/queue_state.lua
@@ -85,8 +85,12 @@ local function create_state_fiber(on_state_change_cb)
log.info('Queue state changed: WAITING')
end
end
+ -- Handle server shutdown.
+ if not pcall(fiber.testcancel) then break end
end
end)
+
+ log.info('Finished queue state fiber')
end
-- Public methods.
nshy
force-pushed
the
make-queue-fibers-cancellable
branch
from
99fed57
to
38852a5
Compare
We are going to finish all client (non-system) fibers in the process of Tarantool shutdown. First we cancel them and then wait for their finishing. So if the client fibers are not finished Tarantool shutdown is never finished too. Currently the fiber can not be finished and we got hang in integration testing of PR tarantool/tarantool#9604.
Same as fixing a typo in e355387 ("fix fifottl_fiber_iteration error handling") for fifottl. Required to pass integration testing of PR tarantool/tarantool#9604.
nshy
force-pushed
the
make-queue-fibers-cancellable
branch
from
38852a5
to
47378d2
Compare
LeonidVas
approved these changes
Jan 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We are going to finish all client (non-system) fibers in the process of Tarantool shutdown. First we cancel them and then wait for their finishing. So if the client fibers are not finished Tarantool shutdown is never finished too.
Currently some of queue fibers can not be finished and we got hang on integration testing of PR [1]. Let's fix it.
[1] PR with client fibers finishing on shutdown.
tarantool/tarantool#9604