Explicitly send function commands to monitor (#11510)

Both functions and eval are marked as "no-monitor", since we want to explicitly feed in the script command before the commands generated by the script. Note that we want this behavior generally, so that commands can redact arguments before being added to the monitor.

(cherry picked from commit d136bf2830)
This commit is contained in:
Madelyn Olson 2022-11-15 17:21:27 -08:00 committed by Oran Agra
parent 7ad786db2e
commit a26ac7ebbc
2 changed files with 16 additions and 0 deletions

View File

@ -616,6 +616,9 @@ uint64_t fcallGetCommandFlags(client *c, uint64_t cmd_flags) {
} }
static void fcallCommandGeneric(client *c, int ro) { static void fcallCommandGeneric(client *c, int ro) {
/* Functions need to be fed to monitors before the commands they execute. */
replicationFeedMonitors(c,server.monitors,c->db->id,c->argv,c->argc);
robj *function_name = c->argv[1]; robj *function_name = c->argv[1];
functionInfo *fi = dictFetchValue(curr_functions_lib_ctx->functions, function_name->ptr); functionInfo *fi = dictFetchValue(curr_functions_lib_ctx->functions, function_name->ptr);
if (!fi) { if (!fi) {

View File

@ -77,6 +77,19 @@ start_server {tags {"introspection"}} {
$rd close $rd close
} }
test {MONITOR can log commands issued by functions} {
r function load replace {#!lua name=test
redis.register_function('test', function() return redis.call('set', 'foo', 'bar') end)
}
set rd [redis_deferring_client]
$rd monitor
$rd read ;# Discard the OK
r fcall test 0
assert_match {*fcall*test*} [$rd read]
assert_match {*lua*"set"*"foo"*"bar"*} [$rd read]
$rd close
}
test {MONITOR supports redacting command arguments} { test {MONITOR supports redacting command arguments} {
set rd [redis_deferring_client] set rd [redis_deferring_client]
$rd monitor $rd monitor