mirror of
https://github.com/valkey-io/valkey.git
synced 2026-07-30 05:03:58 -04:00
2a9a1731ee
The CLUSTER SLOTS reply depends on whether the client is connected over IPv6, but for a fake client there is no connection and when this command is called from a module timer callback or other scenario where no real client is involved, there is no connection to check IPv6 support on. This fix handles the missing case by returning the reply for IPv4 connected clients. Fixes #2912. --------- Signed-off-by: Su Ko <[email protected]> Signed-off-by: Binbin <[email protected]> Signed-off-by: Viktor Söderqvist <[email protected]> Co-authored-by: Su Ko <[email protected]> Co-authored-by: KarthikSubbarao <[email protected]> Co-authored-by: Binbin <[email protected]> Co-authored-by: Viktor Söderqvist <[email protected]>
118 lines
4.3 KiB
C
118 lines
4.3 KiB
C
#include "valkeymodule.h"
|
|
#include <string.h>
|
|
|
|
#define UNUSED(x) (void)(x)
|
|
|
|
void cluster_timer_handler(ValkeyModuleCtx *ctx, void *data) {
|
|
VALKEYMODULE_NOT_USED(data);
|
|
|
|
ValkeyModuleCallReply *rep = ValkeyModule_Call(ctx, "CLUSTER", "c", "SLOTS");
|
|
|
|
if (rep) {
|
|
if (ValkeyModule_CallReplyType(rep) == VALKEYMODULE_REPLY_ARRAY) {
|
|
ValkeyModule_Log(ctx, "notice", "Timer: CLUSTER SLOTS success");
|
|
} else {
|
|
ValkeyModule_Log(ctx, "notice",
|
|
"Timer: CLUSTER SLOTS unexpected reply type %d",
|
|
ValkeyModule_CallReplyType(rep));
|
|
}
|
|
ValkeyModule_FreeCallReply(rep);
|
|
} else {
|
|
ValkeyModule_Log(ctx, "warning", "Timer: CLUSTER SLOTS failed");
|
|
}
|
|
}
|
|
|
|
int test_start_cluster_timer(ValkeyModuleCtx *ctx, ValkeyModuleString **argv, int argc) {
|
|
VALKEYMODULE_NOT_USED(argv);
|
|
VALKEYMODULE_NOT_USED(argc);
|
|
|
|
ValkeyModule_CreateTimer(ctx, 1, cluster_timer_handler, NULL);
|
|
|
|
return ValkeyModule_ReplyWithSimpleString(ctx, "OK");
|
|
}
|
|
|
|
|
|
int test_cluster_slots(ValkeyModuleCtx *ctx, ValkeyModuleString **argv, int argc) {
|
|
UNUSED(argv);
|
|
|
|
if (argc != 1) return ValkeyModule_WrongArity(ctx);
|
|
|
|
ValkeyModuleCallReply *rep = ValkeyModule_Call(ctx, "CLUSTER", "c", "SLOTS");
|
|
if (!rep) {
|
|
ValkeyModule_ReplyWithError(ctx, "ERR NULL reply returned");
|
|
} else {
|
|
ValkeyModule_ReplyWithCallReply(ctx, rep);
|
|
ValkeyModule_FreeCallReply(rep);
|
|
}
|
|
|
|
return VALKEYMODULE_OK;
|
|
}
|
|
|
|
int test_cluster_shards(ValkeyModuleCtx *ctx, ValkeyModuleString **argv, int argc) {
|
|
UNUSED(argv);
|
|
|
|
if (argc != 1) return ValkeyModule_WrongArity(ctx);
|
|
|
|
ValkeyModuleCallReply *rep = ValkeyModule_Call(ctx, "CLUSTER", "c", "SHARDS");
|
|
if (!rep) {
|
|
ValkeyModule_ReplyWithError(ctx, "ERR NULL reply returned");
|
|
} else {
|
|
ValkeyModule_ReplyWithCallReply(ctx, rep);
|
|
ValkeyModule_FreeCallReply(rep);
|
|
}
|
|
|
|
return VALKEYMODULE_OK;
|
|
}
|
|
|
|
#define MSGTYPE_DING 1
|
|
#define MSGTYPE_DONG 2
|
|
|
|
/* test.pingall */
|
|
int PingallCommand(ValkeyModuleCtx *ctx, ValkeyModuleString **argv, int argc) {
|
|
VALKEYMODULE_NOT_USED(argv);
|
|
VALKEYMODULE_NOT_USED(argc);
|
|
|
|
ValkeyModule_SendClusterMessage(ctx, NULL, MSGTYPE_DING, "Hey", 3);
|
|
return ValkeyModule_ReplyWithSimpleString(ctx, "OK");
|
|
}
|
|
|
|
void DingReceiver(ValkeyModuleCtx *ctx, const char *sender_id, uint8_t type, const unsigned char *payload, uint32_t len) {
|
|
ValkeyModule_Log(ctx, "notice", "DING (type %d) RECEIVED from %.*s: '%.*s'", type, VALKEYMODULE_NODE_ID_LEN, sender_id, (int)len, payload);
|
|
/* Ensure sender_id is null-terminated for cross-version compatibility */
|
|
char null_terminated_sender_id[VALKEYMODULE_NODE_ID_LEN + 1];
|
|
memcpy(null_terminated_sender_id, sender_id, VALKEYMODULE_NODE_ID_LEN);
|
|
null_terminated_sender_id[VALKEYMODULE_NODE_ID_LEN] = '\0';
|
|
ValkeyModule_SendClusterMessage(ctx, null_terminated_sender_id, MSGTYPE_DONG, "Message Received!", 17);
|
|
}
|
|
|
|
void DongReceiver(ValkeyModuleCtx *ctx, const char *sender_id, uint8_t type, const unsigned char *payload, uint32_t len) {
|
|
ValkeyModule_Log(ctx, "notice", "DONG (type %d) RECEIVED from %.*s: '%.*s'", type, VALKEYMODULE_NODE_ID_LEN, sender_id, (int)len, payload);
|
|
}
|
|
|
|
int ValkeyModule_OnLoad(ValkeyModuleCtx *ctx, ValkeyModuleString **argv, int argc) {
|
|
VALKEYMODULE_NOT_USED(argv);
|
|
VALKEYMODULE_NOT_USED(argc);
|
|
|
|
if (ValkeyModule_Init(ctx, "cluster", 1, VALKEYMODULE_APIVER_1)== VALKEYMODULE_ERR)
|
|
return VALKEYMODULE_ERR;
|
|
|
|
if (ValkeyModule_CreateCommand(ctx, "test.pingall", PingallCommand, "readonly", 0, 0, 0) ==
|
|
VALKEYMODULE_ERR)
|
|
return VALKEYMODULE_ERR;
|
|
|
|
if (ValkeyModule_CreateCommand(ctx, "test.cluster_slots", test_cluster_slots, "", 0, 0, 0) == VALKEYMODULE_ERR)
|
|
return VALKEYMODULE_ERR;
|
|
|
|
if (ValkeyModule_CreateCommand(ctx, "test.cluster_shards", test_cluster_shards, "", 0, 0, 0) == VALKEYMODULE_ERR)
|
|
return VALKEYMODULE_ERR;
|
|
|
|
if (ValkeyModule_CreateCommand(ctx, "test.start_cluster_timer", test_start_cluster_timer, "", 0, 0, 0) == VALKEYMODULE_ERR)
|
|
return VALKEYMODULE_ERR;
|
|
|
|
/* Register our handlers for different message types. */
|
|
ValkeyModule_RegisterClusterMessageReceiver(ctx, MSGTYPE_DING, DingReceiver);
|
|
ValkeyModule_RegisterClusterMessageReceiver(ctx, MSGTYPE_DONG, DongReceiver);
|
|
|
|
return VALKEYMODULE_OK;
|
|
}
|