fix: loading state error type to be compatible with redis #2629
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
dranikpg
reviewed
Feb 20, 2024
src/facade/reply_builder.cc
Outdated
Comment on lines
311
to
319
|
|
||
| if (err_type == kLoadingErrType) { | ||
| iovec v[] = {IoVec(kLoadingPrefix), IoVec(str), IoVec(kCRLF)}; | ||
| Send(v, ABSL_ARRAYSIZE(v)); | ||
| return; | ||
| } | ||
|
|
||
| iovec v[] = {IoVec(kErrPref), IoVec(str), IoVec(kCRLF)}; | ||
| Send(v, ABSL_ARRAYSIZE(v)); |
There was a problem hiding this comment.
The inconsistency is that we don't use error types for prefixes for other cases (I don't even remember why we have them) and use the prefix directly, see kAuthRejected or kScriptNotFound... so what would be the preferred way now 🙂
There was a problem hiding this comment.
yes I see. error types are used for stats, you might want to send a different error message but register it under the same stat name
romange
reviewed
Feb 20, 2024
src/server/main_service.cc
Outdated
| @@ -988,7 +988,8 @@ std::optional<ErrorReply> Service::VerifyCommandState(const CommandId* cid, CmdA | |||
|
|
|||
| // Check if the command is allowed to execute under this global state | |||
| bool allowed_by_state = true; | |||
| switch (etl.gstate()) { | |||
| const auto gstate = etl.gstate(); | |||
There was a problem hiding this comment.
nit: can you please replace auto with GlobalState?
auto is great for generic code, avoid 120 char type names etc. But lets not use it at least for POD types - it's much harder to review the code when you do not know what type the variable is.
dranikpg
approved these changes
Feb 20, 2024
adiholden
pushed a commit
that referenced
this pull request
Feb 20, 2024
* add -LOADING prefix for loading errors * replace -ERR with -LOADING for loading errors
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.
addresses #2617