From cd4f3e20c182c58806af659c55c12bd0bef0073d Mon Sep 17 00:00:00 2001 From: Binbin Date: Tue, 20 Jun 2023 08:13:18 +0800 Subject: [PATCH] Fix cluster human_nodename Getter data loss in nodes.conf (#12325) auxHumanNodenameGetter limited to %.40s, since we did not limit the length of config cluster-announce-human-nodename, %.40s will cause nodename data loss (we will persist it in nodes.conf). Additional modified auxHumanNodenamePresent to use sdslen. --- src/cluster.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index 7389909ac..4bd873e50 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -240,11 +240,11 @@ int auxHumanNodenameSetter(clusterNode *n, void *value, int length) { } sds auxHumanNodenameGetter(clusterNode *n, sds s) { - return sdscatprintf(s, "%.40s", n->human_nodename); + return sdscatprintf(s, "%s", n->human_nodename); } int auxHumanNodenamePresent(clusterNode *n) { - return strlen(n->human_nodename); + return sdslen(n->human_nodename); } /* clusterLink send queue blocks */