From 44274151fc9f6d06015ae8897160d9317b11c12d Mon Sep 17 00:00:00 2001
From: Roshan Khatri <rvkhatri@amazon.com>
Date: Tue, 23 Jul 2024 08:02:31 +0000
Subject: [PATCH] Address feedback

Signed-off-by: Roshan Khatri <rvkhatri@amazon.com>
---
 src/cluster_legacy.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c
index 79292ef149..25784f6e47 100644
--- a/src/cluster_legacy.c
+++ b/src/cluster_legacy.c
@@ -149,7 +149,10 @@ static inline int defaultClientPort(void) {
     (server.cluster->slots[slot] == NULL || bitmapTestBit(server.cluster->owner_not_claiming_slot, slot))
 
 #define RCVBUF_INIT_LEN 1024
-#define RCVBUF_MIN_READ_LEN 16
+#define RCVBUF_MIN_READ_LEN 14
+static_assert(offsetof(clusterMsg, type) + sizeof(uint16_t) == RCVBUF_MIN_READ_LEN,
+              "Incorrect lenght to read to identify type");
+
 #define RCVBUF_MAX_PREALLOC (1 << 20) /* 1MB */
 
 /* Fixed timeout value for cluster operations (milliseconds) */
@@ -1117,7 +1120,6 @@ void clusterInit(void) {
          * by the createClusterNode() function. */
         myself = server.cluster->myself = createClusterNode(NULL, CLUSTER_NODE_MYSELF | CLUSTER_NODE_PRIMARY);
         serverLog(LL_NOTICE, "No cluster configuration found, I'm %.40s", myself->name);
-        clusterUpdateMyselfFlags();
         clusterAddNode(myself);
         clusterAddNodeToShard(myself->shard_id, myself);
         saveconf = 1;
@@ -1269,7 +1271,7 @@ static clusterMsgSendBlock *createClusterMsgSendBlock(int type, uint32_t msglen)
     msgblock->refcount = 1;
     msgblock->totlen = blocklen;
     server.stat_cluster_links_memory += blocklen;
-    if IS_LIGHT_MESSAGE (type) {
+    if (IS_LIGHT_MESSAGE(type)) {
         clusterBuildMessageHdrLight(&msgblock->msg_light, type, msglen);
     } else {
         clusterBuildMessageHdr(&msgblock->msg, type, msglen);
@@ -2874,7 +2876,7 @@ static clusterNode *getNodeFromLinkAndMsg(clusterLink *link, clusterMsg *hdr) {
     return sender;
 }
 
-void processPublishPacket(clusterMsgDataPublish *publish_data, uint16_t type) {
+void clusterProcessPublishPacket(clusterMsgDataPublish *publish_data, uint16_t type) {
     robj *channel, *message;
     uint32_t channel_len, message_len;
 
@@ -2896,7 +2898,7 @@ void processLightPacket(clusterLink *link, uint16_t type) {
     clusterMsgLight *hdr = (clusterMsgLight *)link->rcvbuf;
 
     if (type == CLUSTERMSG_TYPE_PUBLISH || type == CLUSTERMSG_TYPE_PUBLISHSHARD) {
-        processPublishPacket(&hdr->data.publish.msg, type);
+        clusterProcessPublishPacket(&hdr->data.publish.msg, type);
     }
 }
 
@@ -2916,8 +2918,9 @@ int clusterIsValidPacket(clusterLink *link) {
     uint16_t type = ntohs(hdr->type) & ~CLUSTERMSG_MODIFIER_MASK;
 
     if (is_light && !messageTypeSupportsLightHdr(type)) {
-        serverLog(LL_NOTICE, "--- Packet of type %s does not support light cluster header",
-                  clusterGetMessageTypeString(type));
+        serverLog(LL_NOTICE,
+                  "Packet of type '%s' (%u) does not support light cluster header. Marking packet as invalid.",
+                  clusterGetMessageTypeString(type), type);
         return 0;
     }
 
@@ -3418,7 +3421,7 @@ int clusterProcessPacket(clusterLink *link) {
         }
     } else if (type == CLUSTERMSG_TYPE_PUBLISH || type == CLUSTERMSG_TYPE_PUBLISHSHARD) {
         if (!sender) return 1; /* We don't know that node. */
-        processPublishPacket(&hdr->data.publish.msg, type);
+        clusterProcessPublishPacket(&hdr->data.publish.msg, type);
     } else if (type == CLUSTERMSG_TYPE_FAILOVER_AUTH_REQUEST) {
         if (!sender) return 1; /* We don't know that node. */
         clusterSendFailoverAuthIfNeeded(sender, hdr);