fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-31 14:51:04 +00:00
Code Issues Projects Releases Wiki Activity

Cluster Manager: improve join issue checking

Browse Source
This commit is contained in:
artix 2018-06-06 17:28:29 +02:00
parent 2f499304aa
commit 3578aabc05
1 changed files with 40 additions and 15 deletions

53
src/redis-cli.c

@ -130,6 +130,8 @@
#define CLUSTER_MANAGER_LOG_LVL_ERR 3 #define CLUSTER_MANAGER_LOG_LVL_ERR 3
#define CLUSTER_MANAGER_LOG_LVL_SUCCESS 4 #define CLUSTER_MANAGER_LOG_LVL_SUCCESS 4
#define CLUSTER_JOIN_CHECK_AFTER 20
#define LOG_COLOR_BOLD "29;1m" #define LOG_COLOR_BOLD "29;1m"
#define LOG_COLOR_RED "31;1m" #define LOG_COLOR_RED "31;1m"
#define LOG_COLOR_GREEN "32;1m" #define LOG_COLOR_GREEN "32;1m"
@ -2112,6 +2114,24 @@ static clusterManagerCommandProc *validateClusterManagerCommand(void) {
return proc; return proc;
} }
static int parseClusterNodeAddress(char *addr, char **ip_ptr, int *port_ptr,
int *bus_port_ptr)
{
char *c = strrchr(addr, '@');
if (c != NULL) {
*c = '\0';
if (bus_port_ptr != NULL)
*bus_port_ptr = atoi(c + 1);
}
c = strrchr(addr, ':');
if (c != NULL) {
*c = '\0';
*ip_ptr = addr;
*port_ptr = atoi(++c);
} else return 0;
return 1;
}
/* Get host ip and port from command arguments. If only one argument has /* Get host ip and port from command arguments. If only one argument has
* been provided it must be in the form of 'ip:port', elsewhere * been provided it must be in the form of 'ip:port', elsewhere
* the first argument must be the ip and the second one the port. * the first argument must be the ip and the second one the port.
@ -2124,14 +2144,7 @@ static int getClusterHostFromCmdArgs(int argc, char **argv,
char *ip = NULL; char *ip = NULL;
if (argc == 1) { if (argc == 1) {
char *addr = argv[0]; char *addr = argv[0];
char *c = strrchr(addr, '@'); if (!parseClusterNodeAddress(addr, &ip, &port, NULL)) return 0;
if (c != NULL) *c = '\0';
c = strrchr(addr, ':');
if (c != NULL) {
*c = '\0';
ip = addr;
port = atoi(++c);
} else return 0;
} else { } else {
ip = argv[0]; ip = argv[0];
port = atoi(argv[1]); port = atoi(argv[1]);
@ -3391,7 +3404,9 @@ cleanup:
/* Wait until the cluster configuration is consistent. */ /* Wait until the cluster configuration is consistent. */
static void clusterManagerWaitForClusterJoin(void) { static void clusterManagerWaitForClusterJoin(void) {
printf("Waiting for the cluster to join\n"); printf("Waiting for the cluster to join\n");
int counter = 0, check_after = listLength(cluster_manager.nodes) * 2; int counter = 0,
check_after = CLUSTER_JOIN_CHECK_AFTER +
(int)(listLength(cluster_manager.nodes) * 0.15f);
while(!clusterManagerIsConfigConsistent()) { while(!clusterManagerIsConfigConsistent()) {
printf("."); printf(".");
fflush(stdout); fflush(stdout);
@ -3400,15 +3415,24 @@ static void clusterManagerWaitForClusterJoin(void) {
dict *status = clusterManagerGetLinkStatus(); dict *status = clusterManagerGetLinkStatus();
if (status != NULL && dictSize(status) > 0) { if (status != NULL && dictSize(status) > 0) {
printf("\n"); printf("\n");
clusterManagerLogErr("Warning: %d nodes may " clusterManagerLogErr("Warning: %d node(s) may "
"be unreachable\n", dictSize(status)); "be unreachable\n", dictSize(status));
dictIterator *iter = dictGetIterator(status); dictIterator *iter = dictGetIterator(status);
dictEntry *entry; dictEntry *entry;
while ((entry = dictNext(iter)) != NULL) { while ((entry = dictNext(iter)) != NULL) {
sds nodename = (sds) dictGetKey(entry); sds nodeaddr = (sds) dictGetKey(entry);
char *node_ip = NULL;
int node_port = 0, node_bus_port = 0;
list *from = (list *) dictGetVal(entry); list *from = (list *) dictGetVal(entry);
if (parseClusterNodeAddress(nodeaddr, &node_ip,
&node_port, &node_bus_port) && node_bus_port) {
clusterManagerLogErr(" - The port %d of node %s may "
"be unreachable from:\n",
node_bus_port, node_ip);
} else {
clusterManagerLogErr(" - Node %s may be unreachable " clusterManagerLogErr(" - Node %s may be unreachable "
"from:\n", nodename); "from:\n", nodeaddr);
}
listIter li; listIter li;
listNode *ln; listNode *ln;
listRewind(from, &li); listRewind(from, &li);
@ -3862,12 +3886,13 @@ static list *clusterManagerGetDisconnectedLinks(clusterManagerNode *node) {
if (strstr(flags, "myself") != NULL) continue; if (strstr(flags, "myself") != NULL) continue;
int disconnected = ((strstr(flags, "disconnected") != NULL) || int disconnected = ((strstr(flags, "disconnected") != NULL) ||
(strstr(link_status, "disconnected"))); (strstr(link_status, "disconnected")));
if (disconnected) { int handshaking = (strstr(flags, "handshake") != NULL);
if (disconnected || handshaking) {
clusterManagerLink *link = malloc(sizeof(*link)); clusterManagerLink *link = malloc(sizeof(*link));
link->node_name = sdsnew(nodename); link->node_name = sdsnew(nodename);
link->node_addr = sdsnew(addr); link->node_addr = sdsnew(addr);
link->connected = 0; link->connected = 0;
link->handshaking = (strstr(flags, "handshaking") != NULL); link->handshaking = handshaking;
listAddNodeTail(links, link); listAddNodeTail(links, link);
} }
} }