diff options
author | Oran Agra <oran@redislabs.com> | 2023-02-16 08:07:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-16 08:07:35 +0200 |
commit | 233abbbe03211ca700e10f827d289da24d9bd7e3 (patch) | |
tree | 8c258ab7e81d883efb7b684ef8841bd70f705e9e /src/networking.c | |
parent | a35e08370ac467736328ee5ceed1292cbb2e05db (diff) | |
download | redis-233abbbe03211ca700e10f827d289da24d9bd7e3.tar.gz |
Cleanup around script_caller, fix tracking of scripts and ACL logging for RM_Call (#11770)
* Make it clear that current_client is the root client that was called by
external connection
* add executing_client which is the client that runs the current command
(can be a module or a script)
* Remove script_caller that was used for commands that have CLIENT_SCRIPT
to get the client that called the script. in most cases, that's the current_client,
and in others (when being called from a module), it could be an intermediate
client when we actually want the original one used by the external connection.
bugfixes:
* RM_Call with C flag should log ACL errors with the requested user rather than
the one used by the original client, this also solves a crash when RM_Call is used
with C flag from a detached thread safe context.
* addACLLogEntry would have logged info about the script_caller, but in case the
script was issued by a module command we actually want the current_client. the
exception is when RM_Call is called from a timer event, in which case we don't
have a current_client.
behavior changes:
* client side tracking for scripts now tracks the keys that are read by the script
instead of the keys that are declared by the caller for EVAL
other changes:
* Log both current_client and executing_client in the crash log.
* remove prepareLuaClient and resetLuaClient, being dead code that was forgotten.
* remove scriptTimeSnapshot and snapshot_time and instead add cmd_time_snapshot
that serves all commands and is reset only when execution nesting starts.
* remove code to propagate CLIENT_FORCE_REPL from the executed command
to the script caller since scripts aren't propagated anyway these days and anyway
this flag wouldn't have had an effect since CLIENT_PREVENT_PROP is added by scriptResetRun.
* fix a module GIL violation issue in afterSleep that was introduced in #10300 (unreleased)
Diffstat (limited to 'src/networking.c')
-rw-r--r-- | src/networking.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/networking.c b/src/networking.c index 8f802532d..bb4b203b0 100644 --- a/src/networking.c +++ b/src/networking.c @@ -3921,6 +3921,13 @@ void processEventsWhileBlocked(void) { * interaction time with clients and for other important things. */ updateCachedTime(0); + /* For the few commands that are allowed during busy scripts, we rather + * provide a fresher time than the one from when the script started (they + * still won't get it from the call due to execution_nesting. For commands + * during loading this doesn't matter. */ + mstime_t prev_cmd_time_snapshot = server.cmd_time_snapshot; + server.cmd_time_snapshot = server.mstime; + /* Note: when we are processing events while blocked (for instance during * busy Lua scripts), we set a global flag. When such flag is set, we * avoid handling the read part of clients using threaded I/O. @@ -3945,6 +3952,8 @@ void processEventsWhileBlocked(void) { ProcessingEventsWhileBlocked--; serverAssert(ProcessingEventsWhileBlocked >= 0); + + server.cmd_time_snapshot = prev_cmd_time_snapshot; } /* ========================================================================== |