Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cluster.c
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ void clusterCommand(client *c) {
} else if (!strcasecmp(c->argv[1]->ptr, "info") && c->argc == 2) {
/* CLUSTER INFO */

sds info = genClusterInfoString();
sds info = genClusterInfoString(sdsempty());

/* Produce the reply protocol. */
addReplyVerbatim(c, info, sdslen(info), "txt");
Expand Down
2 changes: 1 addition & 1 deletion src/cluster.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ unsigned long getClusterConnectionsCount(void);
int isClusterHealthy(void);

sds clusterGenNodesDescription(client *c, int filter, int tls_primary);
sds genClusterInfoString(void);
sds genClusterInfoString(sds info);
/* handle implementation specific debug cluster commands. Return 1 if handled, 0 otherwise. */
int handleDebugClusterCommand(client *c);
const char **clusterDebugCommandExtendedHelp(void);
Expand Down
3 changes: 1 addition & 2 deletions src/cluster_legacy.c
Original file line number Diff line number Diff line change
Expand Up @@ -7006,8 +7006,7 @@ void clusterCommandShards(client *c) {
dictReleaseIterator(di);
}

sds genClusterInfoString(void) {
sds info = sdsempty();
sds genClusterInfoString(sds info) {
char *statestr[] = {"ok", "fail"};
int slots_assigned = 0, slots_ok = 0, slots_pfail = 0, slots_fail = 0;

Expand Down
2 changes: 1 addition & 1 deletion src/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -1859,7 +1859,7 @@ __attribute__((noinline)) void logStackTrace(void *eip, int uplevel, int current
#endif /* HAVE_BACKTRACE */

sds genClusterDebugString(sds infostring) {
sds cluster_info = genClusterInfoString();
sds cluster_info = genClusterInfoString(sdsempty());
sds cluster_nodes = clusterGenNodesDescription(NULL, 0, 0);

infostring = sdscatprintf(infostring, "\r\n# Cluster info\r\n");
Expand Down
1 change: 1 addition & 0 deletions src/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -6467,6 +6467,7 @@ sds genValkeyInfoString(dict *section_dict, int all_sections, int everything) {
"# Cluster\r\n"
"cluster_enabled:%d\r\n",
server.cluster_enabled);
if (server.cluster_enabled) info = genClusterInfoString(info);
}

/* Scripting engines */
Expand Down
Loading