caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use sds for clusterNode.hostname (#10290)

Browse Source 
* Provide a fallback static_assert implementation
* Use sds for clusterNode.hostname
This commit is contained in:
Ping Xie 2022-02-16 13:35:49 -08:00 committed by GitHub
parent cca3577503
commit f7f68c654a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/cluster.c
View File

@ -243,10 +243,9 @@ int clusterLoadConfig(char *filename) {
if (hostname) { if (hostname) {
*hostname = '\0'; *hostname = '\0';
hostname++; hostname++;
zfree(n->hostname); n->hostname = sdscpy(n->hostname, hostname);
n->hostname = zstrdup(hostname); } else if (sdslen(n->hostname) != 0) {
} else { sdsclear(n->hostname);
n->hostname = NULL;
} }
/* The plaintext port for client in a TLS cluster (n->pport) is not /* The plaintext port for client in a TLS cluster (n->pport) is not
@ -570,20 +569,15 @@ void clusterUpdateMyselfIp(void) {
/* Update the hostname for the specified node with the provided C string. */ /* Update the hostname for the specified node with the provided C string. */
static void updateAnnouncedHostname(clusterNode *node, char *new) { static void updateAnnouncedHostname(clusterNode *node, char *new) {
if (!node->hostname && !new) {
return;
}
/* Previous and new hostname are the same, no need to update. */ /* Previous and new hostname are the same, no need to update. */
if (new && node->hostname && !strcmp(new, node->hostname)) { if (new && !strcmp(new, node->hostname)) {
return; return;
} }
if (node->hostname) zfree(node->hostname);
if (new) { if (new) {
node->hostname = zstrdup(new); node->hostname = sdscpy(node->hostname, new);
} else { } else if (sdslen(node->hostname) != 0) {
node->hostname = NULL; sdsclear(node->hostname);
} }
} }
@ -959,7 +953,7 @@ clusterNode *createClusterNode(char *nodename, int flags) {
node->link = NULL; node->link = NULL;
node->inbound_link = NULL; node->inbound_link = NULL;
memset(node->ip,0,sizeof(node->ip)); memset(node->ip,0,sizeof(node->ip));
node->hostname = NULL; node->hostname = sdsempty();
node->port = 0; node->port = 0;
node->cport = 0; node->cport = 0;
node->pport = 0; node->pport = 0;
@ -1125,7 +1119,7 @@ void freeClusterNode(clusterNode *n) {
nodename = sdsnewlen(n->name, CLUSTER_NAMELEN); nodename = sdsnewlen(n->name, CLUSTER_NAMELEN);
serverAssert(dictDelete(server.cluster->nodes,nodename) == DICT_OK); serverAssert(dictDelete(server.cluster->nodes,nodename) == DICT_OK);
sdsfree(nodename); sdsfree(nodename);
zfree(n->hostname); sdsfree(n->hostname);
/* Release links and associated data structures. */ /* Release links and associated data structures. */
if (n->link) freeClusterLink(n->link); if (n->link) freeClusterLink(n->link);
@ -1947,9 +1941,9 @@ static clusterMsgPingExt *getNextPingExt(clusterMsgPingExt *ext) {
* will be 8 byte padded. */ * will be 8 byte padded. */
int getHostnamePingExtSize() { int getHostnamePingExtSize() {
/* If hostname is not set, we don't send this extension */ /* If hostname is not set, we don't send this extension */
if (!myself->hostname) return 0; if (sdslen(myself->hostname) == 0) return 0;
int totlen = sizeof(clusterMsgPingExt) + EIGHT_BYTE_ALIGN(strlen(myself->hostname) + 1); int totlen = sizeof(clusterMsgPingExt) + EIGHT_BYTE_ALIGN(sdslen(myself->hostname) + 1);
return totlen; return totlen;
} }
@ -1958,19 +1952,18 @@ int getHostnamePingExtSize() {
* will return the amount of bytes written. */ * will return the amount of bytes written. */
int writeHostnamePingExt(clusterMsgPingExt **cursor) { int writeHostnamePingExt(clusterMsgPingExt **cursor) {
/* If hostname is not set, we don't send this extension */ /* If hostname is not set, we don't send this extension */
if (!myself->hostname) return 0; if (sdslen(myself->hostname) == 0) return 0;
/* Add the hostname information at the extension cursor */ /* Add the hostname information at the extension cursor */
clusterMsgPingExtHostname *ext = &(*cursor)->ext[0].hostname; clusterMsgPingExtHostname *ext = &(*cursor)->ext[0].hostname;
size_t hostname_len = strlen(myself->hostname); memcpy(ext->hostname, myself->hostname, sdslen(myself->hostname));
memcpy(ext->hostname, myself->hostname, hostname_len);
uint32_t extension_size = getHostnamePingExtSize(); uint32_t extension_size = getHostnamePingExtSize();
/* Move the write cursor */ /* Move the write cursor */
(*cursor)->type = CLUSTERMSG_EXT_TYPE_HOSTNAME; (*cursor)->type = CLUSTERMSG_EXT_TYPE_HOSTNAME;
(*cursor)->length = htonl(extension_size); (*cursor)->length = htonl(extension_size);
/* Make sure the string is NULL terminated by adding 1 */ /* Make sure the string is NULL terminated by adding 1 */
*cursor = (clusterMsgPingExt *) (ext->hostname + EIGHT_BYTE_ALIGN(strlen(myself->hostname) + 1)); *cursor = (clusterMsgPingExt *) (ext->hostname + EIGHT_BYTE_ALIGN(sdslen(myself->hostname) + 1));
return extension_size; return extension_size;
} }
@ -2975,7 +2968,7 @@ void clusterSendPing(clusterLink *link, int type) {
/* Set the initial extension position */ /* Set the initial extension position */
clusterMsgPingExt *cursor = getInitialPingExt(hdr, gossipcount); clusterMsgPingExt *cursor = getInitialPingExt(hdr, gossipcount);
/* Add in the extensions */ /* Add in the extensions */
if (myself->hostname) { if (sdslen(myself->hostname) != 0) {
hdr->mflags[0] |= CLUSTERMSG_FLAG0_EXT_DATA; hdr->mflags[0] |= CLUSTERMSG_FLAG0_EXT_DATA;
totlen += writeHostnamePingExt(&cursor); totlen += writeHostnamePingExt(&cursor);
extensions++; extensions++;
@ -3959,7 +3952,8 @@ void clusterCron(void) {
iteration++; /* Number of times this function was called so far. */ iteration++; /* Number of times this function was called so far. */
updateAnnouncedHostname(myself, server.cluster_announce_hostname); clusterUpdateMyselfHostname();
/* The handshake timeout is the time after which a handshake node that was /* The handshake timeout is the time after which a handshake node that was
* not turned into a normal node is removed from the nodes. Usually it is * not turned into a normal node is removed from the nodes. Usually it is
* just the NODE_TIMEOUT value, but when NODE_TIMEOUT is too small we use * just the NODE_TIMEOUT value, but when NODE_TIMEOUT is too small we use
@ -4578,7 +4572,7 @@ sds clusterGenNodeDescription(clusterNode *node, int use_pport) {
/* Node coordinates */ /* Node coordinates */
ci = sdscatlen(sdsempty(),node->name,CLUSTER_NAMELEN); ci = sdscatlen(sdsempty(),node->name,CLUSTER_NAMELEN);
if (node->hostname) { if (sdslen(node->hostname) != 0) {
ci = sdscatfmt(ci," %s:%i@%i,%s ", ci = sdscatfmt(ci," %s:%i@%i,%s ",
node->ip, node->ip,
port, port,
@ -4804,7 +4798,7 @@ void addReplyClusterLinksDescription(client *c) {
const char *getPreferredEndpoint(clusterNode *n) { const char *getPreferredEndpoint(clusterNode *n) {
switch(server.cluster_preferred_endpoint_type) { switch(server.cluster_preferred_endpoint_type) {
case CLUSTER_ENDPOINT_TYPE_IP: return n->ip; case CLUSTER_ENDPOINT_TYPE_IP: return n->ip;
case CLUSTER_ENDPOINT_TYPE_HOSTNAME: return n->hostname ? n->hostname : "?"; case CLUSTER_ENDPOINT_TYPE_HOSTNAME: return (sdslen(n->hostname) != 0) ? n->hostname : "?";
case CLUSTER_ENDPOINT_TYPE_UNKNOWN_ENDPOINT: return ""; case CLUSTER_ENDPOINT_TYPE_UNKNOWN_ENDPOINT: return "";
} }
return "unknown"; return "unknown";
@ -4898,7 +4892,7 @@ void addNodeToNodeReply(client *c, clusterNode *node) {
if (server.cluster_preferred_endpoint_type == CLUSTER_ENDPOINT_TYPE_IP) { if (server.cluster_preferred_endpoint_type == CLUSTER_ENDPOINT_TYPE_IP) {
addReplyBulkCString(c, node->ip); addReplyBulkCString(c, node->ip);
} else if (server.cluster_preferred_endpoint_type == CLUSTER_ENDPOINT_TYPE_HOSTNAME) { } else if (server.cluster_preferred_endpoint_type == CLUSTER_ENDPOINT_TYPE_HOSTNAME) {
addReplyBulkCString(c, node->hostname ? node->hostname : "?"); addReplyBulkCString(c, sdslen(node->hostname) != 0 ? node->hostname : "?");
} else if (server.cluster_preferred_endpoint_type == CLUSTER_ENDPOINT_TYPE_UNKNOWN_ENDPOINT) { } else if (server.cluster_preferred_endpoint_type == CLUSTER_ENDPOINT_TYPE_UNKNOWN_ENDPOINT) {
addReplyNull(c); addReplyNull(c);
} else { } else {
@ -4921,7 +4915,7 @@ void addNodeToNodeReply(client *c, clusterNode *node) {
length++; length++;
} }
if (server.cluster_preferred_endpoint_type != CLUSTER_ENDPOINT_TYPE_HOSTNAME if (server.cluster_preferred_endpoint_type != CLUSTER_ENDPOINT_TYPE_HOSTNAME
&& node->hostname) && sdslen(node->hostname) != 0)
{ {
addReplyBulkCString(c, "hostname"); addReplyBulkCString(c, "hostname");
addReplyBulkCString(c, node->hostname); addReplyBulkCString(c, node->hostname);

5
src/cluster.h
View File

@ -135,7 +135,7 @@ typedef struct clusterNode {
mstime_t orphaned_time; /* Starting time of orphaned master condition */ mstime_t orphaned_time; /* Starting time of orphaned master condition */
long long repl_offset; /* Last known repl offset for this node. */ long long repl_offset; /* Last known repl offset for this node. */
char ip[NET_IP_STR_LEN]; /* Latest known IP address of this node */ char ip[NET_IP_STR_LEN]; /* Latest known IP address of this node */
char *hostname; /* The known hostname for this node */ sds hostname; /* The known hostname for this node */
int port; /* Latest known clients port (TLS or plain). */ int port; /* Latest known clients port (TLS or plain). */
int pport; /* Latest known clients plaintext port. Only used int pport; /* Latest known clients plaintext port. Only used
if the main clients port is for TLS. */ if the main clients port is for TLS. */
@ -339,8 +339,6 @@ typedef struct {
* changes in clusterMsg be caught at compile time. * changes in clusterMsg be caught at compile time.
*/ */
/* Avoid static_assert on non-C11 compilers. */
#if __STDC_VERSION__ >= 201112L
static_assert(offsetof(clusterMsg, sig) == 0, "unexpected field offset"); static_assert(offsetof(clusterMsg, sig) == 0, "unexpected field offset");
static_assert(offsetof(clusterMsg, totlen) == 4, "unexpected field offset"); static_assert(offsetof(clusterMsg, totlen) == 4, "unexpected field offset");
static_assert(offsetof(clusterMsg, ver) == 8, "unexpected field offset"); static_assert(offsetof(clusterMsg, ver) == 8, "unexpected field offset");
@ -362,7 +360,6 @@ static_assert(offsetof(clusterMsg, flags) == 2250, "unexpected field offset");
static_assert(offsetof(clusterMsg, state) == 2252, "unexpected field offset"); static_assert(offsetof(clusterMsg, state) == 2252, "unexpected field offset");
static_assert(offsetof(clusterMsg, mflags) == 2253, "unexpected field offset"); static_assert(offsetof(clusterMsg, mflags) == 2253, "unexpected field offset");
static_assert(offsetof(clusterMsg, data) == 2256, "unexpected field offset"); static_assert(offsetof(clusterMsg, data) == 2256, "unexpected field offset");
#endif
#define CLUSTERMSG_MIN_LEN (sizeof(clusterMsg)-sizeof(union clusterMsgData)) #define CLUSTERMSG_MIN_LEN (sizeof(clusterMsg)-sizeof(union clusterMsgData))

4
src/server.h
View File

@ -57,6 +57,10 @@
#include <systemd/sd-daemon.h> #include <systemd/sd-daemon.h>
#endif #endif
#ifndef static_assert
#define static_assert(expr, lit) extern char __static_assert_failure[(expr) ? 1:-1]
#endif
typedef long long mstime_t; /* millisecond time type. */ typedef long long mstime_t; /* millisecond time type. */
typedef long long ustime_t; /* microsecond time type. */ typedef long long ustime_t; /* microsecond time type. */