diff options
Diffstat (limited to 'src/cluster.c')
| -rw-r--r-- | src/cluster.c | 206 |
1 files changed, 103 insertions, 103 deletions
diff --git a/src/cluster.c b/src/cluster.c index 04ad6231f..089d85992 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -97,7 +97,7 @@ int clusterLoadConfig(char *filename) { if (errno == ENOENT) { return C_ERR; } else { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Loading the cluster node config from %s: %s", filename, strerror(errno)); exit(1); @@ -146,7 +146,7 @@ int clusterLoadConfig(char *filename) { server.cluster->lastVoteEpoch = strtoull(argv[j+1],NULL,10); } else { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Skipping unknown cluster config variable '%s'", argv[j]); } @@ -195,7 +195,7 @@ int clusterLoadConfig(char *filename) { } else if (!strcasecmp(s,"noflags")) { /* nothing to do */ } else { - redisPanic("Unknown flag in redis cluster config file"); + serverPanic("Unknown flag in redis cluster config file"); } if (p) s = p+1; } @@ -264,7 +264,7 @@ int clusterLoadConfig(char *filename) { zfree(line); fclose(fp); - serverLog(REDIS_NOTICE,"Node configuration loaded, I'm %.40s", myself->name); + serverLog(LL_NOTICE,"Node configuration loaded, I'm %.40s", myself->name); /* Something that should never happen: currentEpoch smaller than * the max epoch found in the nodes configuration. However we handle this @@ -275,7 +275,7 @@ int clusterLoadConfig(char *filename) { return C_OK; fmterr: - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Unrecoverable error: corrupted cluster config file."); zfree(line); if (fp) fclose(fp); @@ -343,7 +343,7 @@ err: void clusterSaveConfigOrDie(int do_fsync) { if (clusterSaveConfig(do_fsync) == -1) { - serverLog(REDIS_WARNING,"Fatal: can't update cluster config file."); + serverLog(LL_WARNING,"Fatal: can't update cluster config file."); exit(1); } } @@ -368,7 +368,7 @@ int clusterLockConfig(char *filename) { * processes. */ int fd = open(filename,O_WRONLY|O_CREAT,0644); if (fd == -1) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Can't open %s in order to acquire a lock: %s", filename, strerror(errno)); return C_ERR; @@ -376,13 +376,13 @@ int clusterLockConfig(char *filename) { if (flock(fd,LOCK_EX|LOCK_NB) == -1) { if (errno == EWOULDBLOCK) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Sorry, the cluster configuration file %s is already used " "by a different Redis Cluster node. Please make sure that " "different nodes use different cluster configuration " "files.", filename); } else { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Impossible to lock %s: %s", filename, strerror(errno)); } close(fd); @@ -429,7 +429,7 @@ void clusterInit(void) { * by the createClusterNode() function. */ myself = server.cluster->myself = createClusterNode(NULL,REDIS_NODE_MYSELF|REDIS_NODE_MASTER); - serverLog(REDIS_NOTICE,"No cluster configuration found, I'm %.40s", + serverLog(LL_NOTICE,"No cluster configuration found, I'm %.40s", myself->name); clusterAddNode(myself); saveconf = 1; @@ -443,7 +443,7 @@ void clusterInit(void) { * The other handshake port check is triggered too late to stop * us from trying to use a too-high cluster port number. */ if (server.port > (65535-REDIS_CLUSTER_PORT_INCR)) { - serverLog(REDIS_WARNING, "Redis port number too high. " + serverLog(LL_WARNING, "Redis port number too high. " "Cluster communication port is 10,000 port " "numbers higher than your Redis port. " "Your Redis port number must be " @@ -461,7 +461,7 @@ void clusterInit(void) { for (j = 0; j < server.cfd_count; j++) { if (aeCreateFileEvent(server.el, server.cfd[j], AE_READABLE, clusterAcceptHandler, NULL) == AE_ERR) - redisPanic("Unrecoverable error creating Redis Cluster " + serverPanic("Unrecoverable error creating Redis Cluster " "file event."); } } @@ -522,7 +522,7 @@ void clusterReset(int hard) { server.cluster->currentEpoch = 0; server.cluster->lastVoteEpoch = 0; myself->configEpoch = 0; - serverLog(REDIS_WARNING, "configEpoch set to 0 via CLUSTER RESET HARD"); + serverLog(LL_WARNING, "configEpoch set to 0 via CLUSTER RESET HARD"); /* To change the Node ID we need to remove the old name from the * nodes table, change the ID, and re-add back with new name. */ @@ -573,11 +573,11 @@ void freeClusterLink(clusterLink *link) { void clusterAcceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) { int cport, cfd; int max = MAX_CLUSTER_ACCEPTS_PER_CALL; - char cip[REDIS_IP_STR_LEN]; + char cip[NET_IP_STR_LEN]; clusterLink *link; - REDIS_NOTUSED(el); - REDIS_NOTUSED(mask); - REDIS_NOTUSED(privdata); + UNUSED(el); + UNUSED(mask); + UNUSED(privdata); /* If the server is starting up, don't accept cluster connections: * UPDATE messages may interact with the database content. */ @@ -587,7 +587,7 @@ void clusterAcceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) { cfd = anetTcpAccept(server.neterr, fd, cip, sizeof(cip), &cport); if (cfd == ANET_ERR) { if (errno != EWOULDBLOCK) - serverLog(REDIS_VERBOSE, + serverLog(LL_VERBOSE, "Error accepting cluster node: %s", server.neterr); return; } @@ -595,7 +595,7 @@ void clusterAcceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) { anetEnableTcpNoDelay(NULL,cfd); /* Use non-blocking I/O for cluster messages. */ - serverLog(REDIS_VERBOSE,"Accepted cluster node %s:%d", cip, cport); + serverLog(LL_VERBOSE,"Accepted cluster node %s:%d", cip, cport); /* Create a link object we use to handle the connection. * It gets passed to the readable handler when data is available. * Initiallly the link->node pointer is set to NULL as we don't know @@ -911,7 +911,7 @@ void clusterRenameNode(clusterNode *node, char *newname) { int retval; sds s = sdsnewlen(node->name, REDIS_CLUSTER_NAMELEN); - serverLog(REDIS_DEBUG,"Renaming node %.40s into %.40s", + serverLog(LL_DEBUG,"Renaming node %.40s into %.40s", node->name, newname); retval = dictDelete(server.cluster->nodes, s); sdsfree(s); @@ -980,7 +980,7 @@ int clusterBumpConfigEpochWithoutConsensus(void) { myself->configEpoch = server.cluster->currentEpoch; clusterDoBeforeSleep(CLUSTER_TODO_SAVE_CONFIG| CLUSTER_TODO_FSYNC_CONFIG); - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "New configEpoch set to %llu", (unsigned long long) myself->configEpoch); return C_OK; @@ -1045,7 +1045,7 @@ void clusterHandleConfigEpochCollision(clusterNode *sender) { server.cluster->currentEpoch++; myself->configEpoch = server.cluster->currentEpoch; clusterSaveConfigOrDie(1); - serverLog(REDIS_VERBOSE, + serverLog(LL_VERBOSE, "WARNING: configEpoch collision with node %.40s." " configEpoch set to %llu", sender->name, @@ -1163,7 +1163,7 @@ void markNodeAsFailingIfNeeded(clusterNode *node) { if (nodeIsMaster(myself)) failures++; if (failures < needed_quorum) return; /* No weak agreement from masters. */ - serverLog(REDIS_NOTICE, + serverLog(LL_NOTICE, "Marking node %.40s as failing (quorum reached).", node->name); /* Mark the node as failing. */ @@ -1188,7 +1188,7 @@ void clearNodeFailureIfNeeded(clusterNode *node) { /* For slaves we always clear the FAIL flag if we can contact the * node again. */ if (nodeIsSlave(node) || node->numslots == 0) { - serverLog(REDIS_NOTICE, + serverLog(LL_NOTICE, "Clear FAIL state for node %.40s: %s is reachable again.", node->name, nodeIsSlave(node) ? "slave" : "master without slots"); @@ -1204,7 +1204,7 @@ void clearNodeFailureIfNeeded(clusterNode *node) { (now - node->fail_time) > (server.cluster_node_timeout * REDIS_CLUSTER_FAIL_UNDO_TIME_MULT)) { - serverLog(REDIS_NOTICE, + serverLog(LL_NOTICE, "Clear FAIL state for node %.40s: is reachable again and nobody is serving its slots after some time.", node->name); node->flags &= ~REDIS_NODE_FAIL; @@ -1239,7 +1239,7 @@ int clusterHandshakeInProgress(char *ip, int port) { * EINVAL - IP or port are not valid. */ int clusterStartHandshake(char *ip, int port) { clusterNode *n; - char norm_ip[REDIS_IP_STR_LEN]; + char norm_ip[NET_IP_STR_LEN]; struct sockaddr_storage sa; /* IP sanity check */ @@ -1264,15 +1264,15 @@ int clusterStartHandshake(char *ip, int port) { /* Set norm_ip as the normalized string representation of the node * IP address. */ - memset(norm_ip,0,REDIS_IP_STR_LEN); + memset(norm_ip,0,NET_IP_STR_LEN); if (sa.ss_family == AF_INET) inet_ntop(AF_INET, (void*)&(((struct sockaddr_in *)&sa)->sin_addr), - norm_ip,REDIS_IP_STR_LEN); + norm_ip,NET_IP_STR_LEN); else inet_ntop(AF_INET6, (void*)&(((struct sockaddr_in6 *)&sa)->sin6_addr), - norm_ip,REDIS_IP_STR_LEN); + norm_ip,NET_IP_STR_LEN); if (clusterHandshakeInProgress(norm_ip,port)) { errno = EAGAIN; @@ -1304,7 +1304,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) { sds ci; ci = representRedisNodeFlags(sdsempty(), flags); - serverLog(REDIS_DEBUG,"GOSSIP %.40s %s:%d %s", + serverLog(LL_DEBUG,"GOSSIP %.40s %s:%d %s", g->nodename, g->ip, ntohs(g->port), @@ -1319,14 +1319,14 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) { if (sender && nodeIsMaster(sender) && node != myself) { if (flags & (REDIS_NODE_FAIL|REDIS_NODE_PFAIL)) { if (clusterNodeAddFailureReport(node,sender)) { - serverLog(REDIS_VERBOSE, + serverLog(LL_VERBOSE, "Node %.40s reported node %.40s as not reachable.", sender->name, node->name); } markNodeAsFailingIfNeeded(node); } else { if (clusterNodeDelFailureReport(node,sender)) { - serverLog(REDIS_VERBOSE, + serverLog(LL_VERBOSE, "Node %.40s reported node %.40s is back online.", sender->name, node->name); } @@ -1365,7 +1365,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) { /* IP -> string conversion. 'buf' is supposed to at least be 46 bytes. */ void nodeIp2String(char *buf, clusterLink *link) { - anetPeerToString(link->fd, buf, REDIS_IP_STR_LEN, NULL); + anetPeerToString(link->fd, buf, NET_IP_STR_LEN, NULL); } /* Update the node address to the IP address that can be extracted @@ -1379,7 +1379,7 @@ void nodeIp2String(char *buf, clusterLink *link) { * The function returns 0 if the node address is still the same, * otherwise 1 is returned. */ int nodeUpdateAddressIfNeeded(clusterNode *node, clusterLink *link, int port) { - char ip[REDIS_IP_STR_LEN] = {0}; + char ip[NET_IP_STR_LEN] = {0}; /* We don't proceed if the link is the same as the sender link, as this * function is designed to see if the node link is consistent with the @@ -1397,7 +1397,7 @@ int nodeUpdateAddressIfNeeded(clusterNode *node, clusterLink *link, int port) { node->port = port; if (node->link) freeClusterLink(node->link); node->flags &= ~REDIS_NODE_NOADDR; - serverLog(REDIS_WARNING,"Address updated for node %.40s, now %s:%d", + serverLog(LL_WARNING,"Address updated for node %.40s, now %s:%d", node->name, node->ip, node->port); /* Check if this is our master and we have to change the @@ -1453,7 +1453,7 @@ void clusterUpdateSlotsConfigWith(clusterNode *sender, uint64_t senderConfigEpoc curmaster = nodeIsMaster(myself) ? myself : myself->slaveof; if (sender == myself) { - serverLog(REDIS_WARNING,"Discarding UPDATE message about myself."); + serverLog(LL_WARNING,"Discarding UPDATE message about myself."); return; } @@ -1504,7 +1504,7 @@ void clusterUpdateSlotsConfigWith(clusterNode *sender, uint64_t senderConfigEpoc * 2) We are a slave and our master is left without slots. We need * to replicate to the new slots owner. */ if (newmaster && curmaster->numslots == 0) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Configuration change detected. Reconfiguring myself " "as a replica of %.40s", sender->name); clusterSetMaster(sender); @@ -1542,7 +1542,7 @@ int clusterProcessPacket(clusterLink *link) { clusterNode *sender; server.cluster->stats_bus_messages_received++; - serverLog(REDIS_DEBUG,"--- Processing packet of type %d, %lu bytes", + serverLog(LL_DEBUG,"--- Processing packet of type %d, %lu bytes", type, (unsigned long) totlen); /* Perform sanity checks */ @@ -1612,7 +1612,7 @@ int clusterProcessPacket(clusterLink *link) { server.cluster->mf_master_offset == 0) { server.cluster->mf_master_offset = sender->repl_offset; - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Received replication offset for paused " "master manual failover: %lld", server.cluster->mf_master_offset); @@ -1621,7 +1621,7 @@ int clusterProcessPacket(clusterLink *link) { /* Initial processing of PING and MEET requests replying with a PONG. */ if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_MEET) { - serverLog(REDIS_DEBUG,"Ping packet received: %p", (void*)link->node); + serverLog(LL_DEBUG,"Ping packet received: %p", (void*)link->node); /* We use incoming MEET messages in order to set the address * for 'myself', since only other cluster nodes will send us @@ -1635,13 +1635,13 @@ int clusterProcessPacket(clusterLink *link) { * even with a normal PING packet. If it's wrong it will be fixed * by MEET later. */ if (type == CLUSTERMSG_TYPE_MEET || myself->ip[0] == '\0') { - char ip[REDIS_IP_STR_LEN]; + char ip[NET_IP_STR_LEN]; if (anetSockName(link->fd,ip,sizeof(ip),NULL) != -1 && strcmp(ip,myself->ip)) { - memcpy(myself->ip,ip,REDIS_IP_STR_LEN); - serverLog(REDIS_WARNING,"IP address for this node updated to %s", + memcpy(myself->ip,ip,NET_IP_STR_LEN); + serverLog(LL_WARNING,"IP address for this node updated to %s", myself->ip); clusterDoBeforeSleep(CLUSTER_TODO_SAVE_CONFIG); } @@ -1675,7 +1675,7 @@ int clusterProcessPacket(clusterLink *link) { if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_PONG || type == CLUSTERMSG_TYPE_MEET) { - serverLog(REDIS_DEBUG,"%s packet received: %p", + serverLog(LL_DEBUG,"%s packet received: %p", type == CLUSTERMSG_TYPE_PING ? "ping" : "pong", (void*)link->node); if (link->node) { @@ -1683,7 +1683,7 @@ int clusterProcessPacket(clusterLink *link) { /* If we already have this node, try to change the * IP/port of the node with the new one. */ if (sender) { - serverLog(REDIS_VERBOSE, + serverLog(LL_VERBOSE, "Handshake: we already know node %.40s, " "updating the address if needed.", sender->name); if (nodeUpdateAddressIfNeeded(sender,link,ntohs(hdr->port))) @@ -1700,7 +1700,7 @@ int clusterProcessPacket(clusterLink *link) { /* First thing to do is replacing the random name with the * right node name if this was a handshake stage. */ clusterRenameNode(link->node, hdr->sender); - serverLog(REDIS_DEBUG,"Handshake with node %.40s completed.", + serverLog(LL_DEBUG,"Handshake with node %.40s completed.", link->node->name); link->node->flags &= ~REDIS_NODE_HANDSHAKE; link->node->flags |= flags&(REDIS_NODE_MASTER|REDIS_NODE_SLAVE); @@ -1711,7 +1711,7 @@ int clusterProcessPacket(clusterLink *link) { /* If the reply has a non matching node ID we * disconnect this node and set it as not having an associated * address. */ - serverLog(REDIS_DEBUG,"PONG contains mismatching sender ID"); + serverLog(LL_DEBUG,"PONG contains mismatching sender ID"); link->node->flags |= REDIS_NODE_NOADDR; link->node->ip[0] = '\0'; link->node->port = 0; @@ -1842,7 +1842,7 @@ int clusterProcessPacket(clusterLink *link) { if (server.cluster->slots[j]->configEpoch > senderConfigEpoch) { - serverLog(REDIS_VERBOSE, + serverLog(LL_VERBOSE, "Node %.40s has old slots configuration, sending " "an UPDATE message about %.40s", sender->name, server.cluster->slots[j]->name); @@ -1877,7 +1877,7 @@ int clusterProcessPacket(clusterLink *link) { if (failing && !(failing->flags & (REDIS_NODE_FAIL|REDIS_NODE_MYSELF))) { - serverLog(REDIS_NOTICE, + serverLog(LL_NOTICE, "FAIL message received from %.40s about %.40s", hdr->sender, hdr->data.fail.about.nodename); failing->flags |= REDIS_NODE_FAIL; @@ -1887,7 +1887,7 @@ int clusterProcessPacket(clusterLink *link) { CLUSTER_TODO_UPDATE_STATE); } } else { - serverLog(REDIS_NOTICE, + serverLog(LL_NOTICE, "Ignoring FAIL message from unknown node %.40s about %.40s", hdr->sender, hdr->data.fail.about.nodename); } @@ -1937,7 +1937,7 @@ int clusterProcessPacket(clusterLink *link) { server.cluster->mf_end = mstime() + REDIS_CLUSTER_MF_TIMEOUT; server.cluster->mf_slave = sender; pauseClients(mstime()+(REDIS_CLUSTER_MF_TIMEOUT*2)); - serverLog(REDIS_WARNING,"Manual failover requested by slave %.40s.", + serverLog(LL_WARNING,"Manual failover requested by slave %.40s.", sender->name); } else if (type == CLUSTERMSG_TYPE_UPDATE) { clusterNode *n; /* The node the update is about. */ @@ -1962,7 +1962,7 @@ int clusterProcessPacket(clusterLink *link) { clusterUpdateSlotsConfigWith(n,reportedConfigEpoch, hdr->data.update.nodecfg.slots); } else { - serverLog(REDIS_WARNING,"Received unknown packet type: %d", type); + serverLog(LL_WARNING,"Received unknown packet type: %d", type); } return 1; } @@ -1983,12 +1983,12 @@ void handleLinkIOError(clusterLink *link) { void clusterWriteHandler(aeEventLoop *el, int fd, void *privdata, int mask) { clusterLink *link = (clusterLink*) privdata; ssize_t nwritten; - REDIS_NOTUSED(el); - REDIS_NOTUSED(mask); + UNUSED(el); + UNUSED(mask); nwritten = write(fd, link->sndbuf, sdslen(link->sndbuf)); if (nwritten <= 0) { - serverLog(REDIS_DEBUG,"I/O error writing to node link: %s", + serverLog(LL_DEBUG,"I/O error writing to node link: %s", strerror(errno)); handleLinkIOError(link); return; @@ -2007,8 +2007,8 @@ void clusterReadHandler(aeEventLoop *el, int fd, void *privdata, int mask) { clusterMsg *hdr; clusterLink *link = (clusterLink*) privdata; unsigned int readlen, rcvbuflen; - REDIS_NOTUSED(el); - REDIS_NOTUSED(mask); + UNUSED(el); + UNUSED(mask); while(1) { /* Read as long as there is data to read. */ rcvbuflen = sdslen(link->rcvbuf); @@ -2025,7 +2025,7 @@ void clusterReadHandler(aeEventLoop *el, int fd, void *privdata, int mask) { if (memcmp(hdr->sig,"RCmb",4) != 0 || ntohl(hdr->totlen) < CLUSTERMSG_MIN_LEN) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Bad message length or signature received " "from Cluster bus."); handleLinkIOError(link); @@ -2041,7 +2041,7 @@ void clusterReadHandler(aeEventLoop *el, int fd, void *privdata, int mask) { if (nread <= 0) { /* I/O error... */ - serverLog(REDIS_DEBUG,"I/O error reading from node link: %s", + serverLog(LL_DEBUG,"I/O error reading from node link: %s", (nread == 0) ? "connection closed" : strerror(errno)); handleLinkIOError(link); return; @@ -2471,7 +2471,7 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) { * our currentEpoch was updated as a side effect of receiving this * request, if the request epoch was greater. */ if (requestCurrentEpoch < server.cluster->currentEpoch) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover auth denied to %.40s: reqEpoch (%llu) < curEpoch(%llu)", node->name, (unsigned long long) requestCurrentEpoch, @@ -2481,7 +2481,7 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) { /* I already voted for this epoch? Return ASAP. */ if (server.cluster->lastVoteEpoch == server.cluster->currentEpoch) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover auth denied to %.40s: already voted for epoch %llu", node->name, (unsigned long long) server.cluster->currentEpoch); @@ -2495,15 +2495,15 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) { (!nodeFailed(master) && !force_ack)) { if (nodeIsMaster(node)) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover auth denied to %.40s: it is a master node", node->name); } else if (master == NULL) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover auth denied to %.40s: I don't know its master", node->name); } else if (!nodeFailed(master)) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover auth denied to %.40s: its master is up", node->name); } @@ -2515,7 +2515,7 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) { * of the algorithm but makes the base case more linear. */ if (mstime() - node->slaveof->voted_time < server.cluster_node_timeout * 2) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover auth denied to %.40s: " "can't vote about this master before %lld milliseconds", node->name, @@ -2537,7 +2537,7 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) { /* If we reached this point we found a slot that in our current slots * is served by a master with a greater configEpoch than the one claimed * by the slave requesting our vote. Refuse to vote for this slave. */ - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover auth denied to %.40s: " "slot %d epoch (%llu) > reqEpoch (%llu)", node->name, j, @@ -2550,7 +2550,7 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) { clusterSendFailoverAuth(node); server.cluster->lastVoteEpoch = server.cluster->currentEpoch; node->slaveof->voted_time = mstime(); - serverLog(REDIS_WARNING, "Failover auth granted to %.40s for epoch %llu", + serverLog(LL_WARNING, "Failover auth granted to %.40s for epoch %llu", node->name, (unsigned long long) server.cluster->currentEpoch); } @@ -2641,7 +2641,7 @@ void clusterLogCantFailover(int reason) { break; } lastlog_time = time(NULL); - serverLog(REDIS_WARNING,"Currently unable to failover: %s", msg); + serverLog(LL_WARNING,"Currently unable to failover: %s", msg); } /* This function implements the final part of automatic and manual failovers, @@ -2727,7 +2727,7 @@ void clusterHandleSlaveFailover(void) { /* Set data_age to the number of seconds we are disconnected from * the master. */ - if (server.repl_state == REDIS_REPL_CONNECTED) { + if (server.repl_state == REPL_STATE_CONNECTED) { data_age = (mstime_t)(server.unixtime - server.master->lastinteraction) * 1000; } else { @@ -2774,7 +2774,7 @@ void clusterHandleSlaveFailover(void) { server.cluster->failover_auth_time = mstime(); server.cluster->failover_auth_rank = 0; } - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Start of election delayed for %lld milliseconds " "(rank #%d, offset %lld).", server.cluster->failover_auth_time - mstime(), @@ -2801,7 +2801,7 @@ void clusterHandleSlaveFailover(void) { (newrank - server.cluster->failover_auth_rank) * 1000; server.cluster->failover_auth_time += added_delay; server.cluster->failover_auth_rank = newrank; - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Slave rank updated to #%d, added %lld milliseconds of delay.", newrank, added_delay); } @@ -2823,7 +2823,7 @@ void clusterHandleSlaveFailover(void) { if (server.cluster->failover_auth_sent == 0) { server.cluster->currentEpoch++; server.cluster->failover_auth_epoch = server.cluster->currentEpoch; - serverLog(REDIS_WARNING,"Starting a failover election for epoch %llu.", + serverLog(LL_WARNING,"Starting a failover election for epoch %llu.", (unsigned long long) server.cluster->currentEpoch); clusterRequestFailoverAuth(); server.cluster->failover_auth_sent = 1; @@ -2837,13 +2837,13 @@ void clusterHandleSlaveFailover(void) { if (server.cluster->failover_auth_count >= needed_quorum) { /* We have the quorum, we can finally failover the master. */ - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "Failover election won: I'm the new master."); /* Update my configEpoch to the epoch of the election. */ if (myself->configEpoch < server.cluster->failover_auth_epoch) { myself->configEpoch = server.cluster->failover_auth_epoch; - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "configEpoch set to %llu after successful failover", (unsigned long long) myself->configEpoch); } @@ -2941,7 +2941,7 @@ void clusterHandleSlaveMigration(int max_slaves) { /* Step 4: perform the migration if there is a target, and if I'm the * candidate. */ if (target && candidate == myself) { - serverLog(REDIS_WARNING,"Migrating to orphaned master %.40s", + serverLog(LL_WARNING,"Migrating to orphaned master %.40s", target->name); clusterSetMaster(target); } @@ -2995,7 +2995,7 @@ void resetManualFailover(void) { /* If a manual failover timed out, abort it. */ void manualFailoverCheckTimeout(void) { if (server.cluster->mf_end && server.cluster->mf_end < mstime()) { - serverLog(REDIS_WARNING,"Manual failover timed out."); + serverLog(LL_WARNING,"Manual failover timed out."); resetManualFailover(); } } @@ -3016,7 +3016,7 @@ void clusterHandleManualFailover(void) { /* Our replication offset matches the master replication offset * announced after clients were paused. We can start the failover. */ server.cluster->mf_can_start = 1; - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "All master replication stream processed, " "manual failover can start."); } @@ -3068,7 +3068,7 @@ void clusterCron(void) { clusterLink *link; fd = anetTcpNonBlockBindConnect(server.neterr, node->ip, - node->port+REDIS_CLUSTER_PORT_INCR, REDIS_BIND_ADDR); + node->port+REDIS_CLUSTER_PORT_INCR, NET_FIRST_BIND_ADDR); if (fd == -1) { /* We got a synchronous error from connect before * clusterSendPing() had a chance to be called. @@ -3076,7 +3076,7 @@ void clusterCron(void) { * so we claim we actually sent a ping now (that will * be really sent as soon as the link is obtained). */ if (node->ping_sent == 0) node->ping_sent = mstime(); - serverLog(REDIS_DEBUG, "Unable to connect to " + serverLog(LL_DEBUG, "Unable to connect to " "Cluster Node [%s]:%d -> %s", node->ip, node->port+REDIS_CLUSTER_PORT_INCR, server.neterr); @@ -3109,7 +3109,7 @@ void clusterCron(void) { * normal PING packets. */ node->flags &= ~REDIS_NODE_MEET; - serverLog(REDIS_DEBUG,"Connecting with Node %.40s at %s:%d", + serverLog(LL_DEBUG,"Connecting with Node %.40s at %s:%d", node->name, node->ip, node->port+REDIS_CLUSTER_PORT_INCR); } } @@ -3136,7 +3136,7 @@ void clusterCron(void) { } } if (min_pong_node) { - serverLog(REDIS_DEBUG,"Pinging node %.40s", min_pong_node->name); + serverLog(LL_DEBUG,"Pinging node %.40s", min_pong_node->name); clusterSendPing(min_pong_node->link, CLUSTERMSG_TYPE_PING); } } @@ -3225,7 +3225,7 @@ void clusterCron(void) { /* Timeout reached. Set the node as possibly failing if it is * not already in this state. */ if (!(node->flags & (REDIS_NODE_PFAIL|REDIS_NODE_FAIL))) { - serverLog(REDIS_DEBUG,"*** NODE %.40s possibly failing", + serverLog(LL_DEBUG,"*** NODE %.40s possibly failing", node->name); node->flags |= REDIS_NODE_PFAIL; update_state = 1; @@ -3488,7 +3488,7 @@ void clusterUpdateState(void) { } /* Change the state and log the event. */ - serverLog(REDIS_WARNING,"Cluster state changed: %s", + serverLog(LL_WARNING,"Cluster state changed: %s", new_state == REDIS_CLUSTER_OK ? "ok" : "fail"); server.cluster->state = new_state; } @@ -3546,11 +3546,11 @@ int verifyClusterConfigWithData(void) { update_config++; /* Case A: slot is unassigned. Take responsibility for it. */ if (server.cluster->slots[j] == NULL) { - serverLog(REDIS_WARNING, "I have keys for unassigned slot %d. " + serverLog(LL_WARNING, "I have keys for unassigned slot %d. " "Taking responsibility for it.",j); clusterAddSlot(myself,j); } else { - serverLog(REDIS_WARNING, "I have keys for slot %d, but the slot is " + serverLog(LL_WARNING, "I have keys for slot %d, but the slot is " "assigned to another node. " "Setting it to importing state.",j); server.cluster->importing_slots_from[j] = server.cluster->slots[j]; @@ -3978,7 +3978,7 @@ void clusterCommand(client *c) { * configEpoch collision resolution will fix it assigning * a different epoch to each node. */ if (clusterBumpConfigEpochWithoutConsensus() == C_OK) { - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "configEpoch updated after importing slot %d", slot); } server.cluster->importing_slots_from[slot] = NULL; @@ -4220,17 +4220,17 @@ void clusterCommand(client *c) { * generates a new configuration epoch for this node without * consensus, claims the master's slots, and broadcast the new * configuration. */ - serverLog(REDIS_WARNING,"Taking over the master (user request)."); + serverLog(LL_WARNING,"Taking over the master (user request)."); clusterBumpConfigEpochWithoutConsensus(); clusterFailoverReplaceYourMaster(); } else if (force) { /* If this is a forced failover, we don't need to talk with our * master to agree about the offset. We just failover taking over * it without coordination. */ - serverLog(REDIS_WARNING,"Forced failover user request accepted."); + serverLog(LL_WARNING,"Forced failover user request accepted."); server.cluster->mf_can_start = 1; } else { - serverLog(REDIS_WARNING,"Manual failover user request accepted."); + serverLog(LL_WARNING,"Manual failover user request accepted."); clusterSendMFStart(myself->slaveof); } addReply(c,shared.ok); @@ -4257,7 +4257,7 @@ void clusterCommand(client *c) { addReplyError(c,"Node config epoch is already non-zero"); } else { myself->configEpoch = epoch; - serverLog(REDIS_WARNING, + serverLog(LL_WARNING, "configEpoch set to %llu via CLUSTER SET-CONFIG-EPOCH", (unsigned long long) myself->configEpoch); @@ -4326,8 +4326,8 @@ void createDumpPayload(rio *payload, robj *o) { */ /* RDB version */ - buf[0] = REDIS_RDB_VERSION & 0xff; - buf[1] = (REDIS_RDB_VERSION >> 8) & 0xff; + buf[0] = RDB_VERSION & 0xff; + buf[1] = (RDB_VERSION >> 8) & 0xff; payload->io.buffer.ptr = sdscatlen(payload->io.buffer.ptr,buf,2); /* CRC64 */ @@ -4352,7 +4352,7 @@ int verifyDumpPayload(unsigned char *p, size_t len) { /* Verify RDB version */ rdbver = (footer[1] << 8) | footer[0]; - if (rdbver != REDIS_RDB_VERSION) return C_ERR; + if (rdbver != RDB_VERSION) return C_ERR; /* Verify CRC64 */ crc = crc64(0,p,len-8); @@ -4728,7 +4728,7 @@ void askingCommand(client *c) { addReplyError(c,"This instance has cluster support disabled"); return; } - c->flags |= REDIS_ASKING; + c->flags |= CLIENT_ASKING; addReply(c,shared.ok); } @@ -4740,13 +4740,13 @@ void readonlyCommand(client *c) { addReplyError(c,"This instance has cluster support disabled"); return; } - c->flags |= REDIS_READONLY; + c->flags |= CLIENT_READONLY; addReply(c,shared.ok); } /* The READWRITE command just clears the READONLY command state. */ void readwriteCommand(client *c) { - c->flags &= ~REDIS_READONLY; + c->flags &= ~CLIENT_READONLY; addReply(c,shared.ok); } @@ -4793,9 +4793,9 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in /* We handle all the cases as if they were EXEC commands, so we have * a common code path for everything */ if (cmd->proc == execCommand) { - /* If REDIS_MULTI flag is not set EXEC is just going to return an + /* If CLIENT_MULTI flag is not set EXEC is just going to return an * error. */ - if (!(c->flags & REDIS_MULTI)) return myself; + if (!(c->flags & CLIENT_MULTI)) return myself; ms = &c->mstate; } else { /* In order to have a single codepath create a fake Multi State @@ -4906,7 +4906,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in * involves multiple keys and we don't have them all, the only option is * to send a TRYAGAIN error. */ if (importing_slot && - (c->flags & REDIS_ASKING || cmd->flags & REDIS_CMD_ASKING)) + (c->flags & CLIENT_ASKING || cmd->flags & CMD_ASKING)) { if (multiple_keys && missing_keys) { if (error_code) *error_code = REDIS_CLUSTER_REDIR_UNSTABLE; @@ -4919,8 +4919,8 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in /* Handle the read-only client case reading from a slave: if this * node is a slave and the request is about an hash slot our master * is serving, we can reply without redirection. */ - if (c->flags & REDIS_READONLY && - cmd->flags & REDIS_CMD_READONLY && + if (c->flags & CLIENT_READONLY && + cmd->flags & CMD_READONLY && nodeIsSlave(myself) && myself->slaveof == n) { @@ -4960,7 +4960,7 @@ void clusterRedirectClient(client *c, clusterNode *n, int hashslot, int error_co (error_code == REDIS_CLUSTER_REDIR_ASK) ? "ASK" : "MOVED", hashslot,n->ip,n->port)); } else { - redisPanic("getNodeByQuery() unknown error."); + serverPanic("getNodeByQuery() unknown error."); } } @@ -4976,7 +4976,7 @@ void clusterRedirectClient(client *c, clusterNode *n, int hashslot, int error_co * longer handles, the client is sent a redirection error, and the function * returns 1. Otherwise 0 is returned and no operation is performed. */ int clusterRedirectBlockedClientIfNeeded(client *c) { - if (c->flags & REDIS_BLOCKED && c->btype == REDIS_BLOCKED_LIST) { + if (c->flags & CLIENT_BLOCKED && c->btype == BLOCKED_LIST) { dictEntry *de; dictIterator *di; |