From 39df99036adbae905efeccece7e3d84b68d288b9 Mon Sep 17 00:00:00 2001 From: proost Date: Sun, 29 Dec 2024 18:56:37 +0900 Subject: [PATCH] fix: change error message Signed-off-by: proost --- src/script.c | 6 ++---- tests/unit/cluster/scripting.tcl | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/script.c b/src/script.c index 6cd87913a4..503e58d484 100644 --- a/src/script.c +++ b/src/script.c @@ -375,7 +375,6 @@ static int scriptVerifyWriteCommandAllow(scriptRunCtx *run_ctx, char **err) { /* * If client is readonly and server is a replica, we should not allow write-commands. - * we should redirect the client. */ if (run_ctx->original_client->flag.readonly && server.primary_host) { client *c = run_ctx->c; @@ -392,9 +391,8 @@ static int scriptVerifyWriteCommandAllow(scriptRunCtx *run_ctx, char **err) { clusterNode *n = getNodeByQuery(c, c->cmd, c->argv, c->argc, &hashslot, &error_code); if (n == NULL || !clusterNodeIsMyself(n)) { if (error_code == CLUSTER_REDIR_MOVED || error_code == CLUSTER_REDIR_ASK) { - int port = clusterNodeClientPort(n, connIsTLS(original_c->conn)); - *err = sdscatprintf(sdsempty(), "-%s %d %s:%d", (error_code == CLUSTER_REDIR_ASK) ? "ASK" : "MOVED", - hashslot, clusterNodePreferredEndpoint(n, c), port); + *err = sdsnew("Script attempted to access a non local key in a " + "cluster node"); return C_ERR; } } diff --git a/tests/unit/cluster/scripting.tcl b/tests/unit/cluster/scripting.tcl index c753416476..e7c5e3d262 100644 --- a/tests/unit/cluster/scripting.tcl +++ b/tests/unit/cluster/scripting.tcl @@ -117,7 +117,7 @@ start_cluster 2 2 {tags {external:skip cluster}} { $replica2 eval "redis.call('set', 'foo', 'bar')" 0 } e - assert_match {*MOVED*} $e + assert_match {*Script attempted to access a non local ke*} $e } test "Read-only client that sends lua script which has write command on replica get ASK error during migration" { @@ -130,6 +130,6 @@ start_cluster 2 2 {tags {external:skip cluster}} { $replica2 eval "redis.call('set', 'foo', 'bar')" 0 } e - assert_match {*ASK*} $e + assert_match {*Script attempted to access a non local ke*} $e } }