fix(server): Init tx time for all multi/lua transactions #2562
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
kostasrim
previously approved these changes
Feb 8, 2024
romange
reviewed
Feb 8, 2024
src/server/generic_family.cc
Outdated
| if (cntx->transaction) { | ||
| // This will be 0 if run under an unscheduled transaction |
There was a problem hiding this comment.
how come we run under unscheduled transaction?
There was a problem hiding this comment.
Because this transaction has no keys, see #2555 (comment):
EVAL "return redis.call('TIME')" 0
There was a problem hiding this comment.
Roman, your comment made me rethink my solution. Now I explicitly init tx time in all cases, including empty keys multi/lua. PTAL.
chakaz
changed the title
TIME under unscheduled tx
adiholden
reviewed
Feb 8, 2024
src/server/main_service.cc
Outdated
| @@ -1710,8 +1710,10 @@ optional<bool> StartMultiEval(DbIndex dbid, CmdArgList keys, ScriptMgr::ScriptPa | |||
| return false; | |||
| } | |||
|
|
|||
| if (keys.empty() && script_mode == Transaction::LOCK_AHEAD) | |||
| if (keys.empty() && script_mode == Transaction::LOCK_AHEAD) { | |||
| trans->InitTxTime(); | |||
There was a problem hiding this comment.
where do we call InitTxTime for NON_ATOMIC mode and keys is empty?
adiholden
reviewed
Feb 8, 2024
src/server/main_service.cc
Outdated
| @@ -2040,7 +2042,9 @@ void Service::Exec(CmdArgList args, ConnectionContext* cntx) { | |||
| "Dragonfly does not allow execution of a server-side Lua in Multi transaction"); | |||
|
|
|||
| bool scheduled = false; | |||
| if (*multi_mode != Transaction::NOT_DETERMINED) { | |||
| if (*multi_mode == Transaction::NOT_DETERMINED) { | |||
| cntx->transaction->InitTxTime(); | |||
There was a problem hiding this comment.
how about call this in transaction constructor and if we will do scheduling this will overide the value
There was a problem hiding this comment.
That's a fantastic idea!
adiholden
approved these changes
Feb 8, 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.
Fixes #2555