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

Cluster Manager backup: remove --cluster-ignore-issue option

Browse Source 
Always save the backup, even if there are problems in the cluster.
Just display a warn message and save "cluster_errors" property
inside the json.
This commit is contained in:
artix 2019-03-01 17:40:22 +01:00
parent 5e4dfc5c97
commit e6156a39bd
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/redis-cli.c
View File

@ -118,7 +118,6 @@
#define CLUSTER_MANAGER_CMD_FLAG_COPY 1 << 7 #define CLUSTER_MANAGER_CMD_FLAG_COPY 1 << 7
#define CLUSTER_MANAGER_CMD_FLAG_COLOR 1 << 8 #define CLUSTER_MANAGER_CMD_FLAG_COLOR 1 << 8
#define CLUSTER_MANAGER_CMD_FLAG_CHECK_OWNERS 1 << 9 #define CLUSTER_MANAGER_CMD_FLAG_CHECK_OWNERS 1 << 9
#define CLUSTER_MANAGER_CMD_FLAG_IGNORE_ISSUES 1 << 10
#define CLUSTER_MANAGER_OPT_GETFRIENDS 1 << 0 #define CLUSTER_MANAGER_OPT_GETFRIENDS 1 << 0
#define CLUSTER_MANAGER_OPT_COLD 1 << 1 #define CLUSTER_MANAGER_OPT_COLD 1 << 1
@ -1417,9 +1416,6 @@ static int parseOptions(int argc, char **argv) {
} else if (!strcmp(argv[i],"--cluster-yes")) { } else if (!strcmp(argv[i],"--cluster-yes")) {
config.cluster_manager_command.flags |= config.cluster_manager_command.flags |=
CLUSTER_MANAGER_CMD_FLAG_YES; CLUSTER_MANAGER_CMD_FLAG_YES;
} else if (!strcmp(argv[i],"--cluster-ignore-issues")) {
config.cluster_manager_command.flags |=
CLUSTER_MANAGER_CMD_FLAG_IGNORE_ISSUES;
} else if (!strcmp(argv[i],"--cluster-simulate")) { } else if (!strcmp(argv[i],"--cluster-simulate")) {
config.cluster_manager_command.flags |= config.cluster_manager_command.flags |=
CLUSTER_MANAGER_CMD_FLAG_SIMULATE; CLUSTER_MANAGER_CMD_FLAG_SIMULATE;
@ -2095,7 +2091,7 @@ clusterManagerCommandDef clusterManagerCommands[] = {
{"import", clusterManagerCommandImport, 1, "host:port", {"import", clusterManagerCommandImport, 1, "host:port",
"from <arg>,copy,replace"}, "from <arg>,copy,replace"},
{"backup", clusterManagerCommandBackup, 2, "host:port backup_directory", {"backup", clusterManagerCommandBackup, 2, "host:port backup_directory",
"ignore-issues"}, NULL},
{"help", clusterManagerCommandHelp, 0, NULL, NULL} {"help", clusterManagerCommandHelp, 0, NULL, NULL}
}; };
@ -2699,7 +2695,9 @@ static sds clusterManagerNodeSlotsString(clusterManagerNode *node) {
return slots; return slots;
} }
static sds clusterManagerNodeGetJSON(clusterManagerNode *node) { static sds clusterManagerNodeGetJSON(clusterManagerNode *node,
unsigned long error_count)
{
sds json = sdsempty(); sds json = sdsempty();
sds replicate = sdsempty(); sds replicate = sdsempty();
if (node->replicate) if (node->replicate)
@ -2718,10 +2716,9 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node) {
" \"port\": %d,\n" " \"port\": %d,\n"
" \"replicate\": %s,\n" " \"replicate\": %s,\n"
" \"slots\": [%s],\n" " \"slots\": [%s],\n"
" \"slots_count\": [%d],\n" " \"slots_count\": %d,\n"
" \"flags\": \"%s\",\n" " \"flags\": \"%s\",\n"
" \"current_epoch\": %llu\n" " \"current_epoch\": %llu",
" }",
node->name, node->name,
node->ip, node->ip,
node->port, node->port,
@ -2731,6 +2728,11 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node) {
flags, flags,
node->current_epoch node->current_epoch
); );
if (error_count > 0) {
json = sdscatprintf(json, ",\n \"cluster_errors\": %lu",
error_count);
}
json = sdscat(json, "\n }");
sdsfree(replicate); sdsfree(replicate);
sdsfree(slots); sdsfree(slots);
sdsfree(flags); sdsfree(flags);
@ -6118,21 +6120,9 @@ static int clusterManagerCommandBackup(int argc, char **argv) {
if (!getClusterHostFromCmdArgs(1, argv, &ip, &port)) goto invalid_args; if (!getClusterHostFromCmdArgs(1, argv, &ip, &port)) goto invalid_args;
clusterManagerNode *refnode = clusterManagerNewNode(ip, port); clusterManagerNode *refnode = clusterManagerNewNode(ip, port);
if (!clusterManagerLoadInfoFromNode(refnode, 0)) return 0; if (!clusterManagerLoadInfoFromNode(refnode, 0)) return 0;
int ignore_issues = config.cluster_manager_command.flags & int no_issues = clusterManagerCheckCluster(0);
CLUSTER_MANAGER_CMD_FLAG_IGNORE_ISSUES; int cluster_errors_count = (no_issues ? 0 :
if (!ignore_issues) { listLength(cluster_manager.errors));
success = clusterManagerCheckCluster(0);
if (success && cluster_manager.errors &&
listLength(cluster_manager.errors) > 0) success = 0;
if (!success) {
fflush(stdout);
clusterManagerLogErr("*** Please fix your cluster problems before "
"creating a backup, otherwise invoke the "
"backup command with "
"--cluster-ignore-issues options\n");
return 0;
}
}
config.cluster_manager_command.backup_dir = argv[1]; config.cluster_manager_command.backup_dir = argv[1];
/* TODO: check if backup_dir is a valid directory. */ /* TODO: check if backup_dir is a valid directory. */
sds json = sdsnew("[\n"); sds json = sdsnew("[\n");
@ -6144,7 +6134,7 @@ static int clusterManagerCommandBackup(int argc, char **argv) {
if (!first_node) first_node = 1; if (!first_node) first_node = 1;
else json = sdscat(json, ",\n"); else json = sdscat(json, ",\n");
clusterManagerNode *node = ln->value; clusterManagerNode *node = ln->value;
sds node_json = clusterManagerNodeGetJSON(node); sds node_json = clusterManagerNodeGetJSON(node, cluster_errors_count);
json = sdscat(json, node_json); json = sdscat(json, node_json);
sdsfree(node_json); sdsfree(node_json);
if (node->replicate) if (node->replicate)
@ -6159,10 +6149,11 @@ static int clusterManagerCommandBackup(int argc, char **argv) {
if (jsonpath[sdslen(jsonpath) - 1] != '/') if (jsonpath[sdslen(jsonpath) - 1] != '/')
jsonpath = sdscat(jsonpath, "/"); jsonpath = sdscat(jsonpath, "/");
jsonpath = sdscat(jsonpath, "nodes.json"); jsonpath = sdscat(jsonpath, "nodes.json");
/*printf("%s\n", json);*/ fflush(stdout);
clusterManagerLogInfo("Saving cluster configuration to: %s\n", jsonpath);
FILE *out = fopen(jsonpath, "w+"); FILE *out = fopen(jsonpath, "w+");
if (!out) { if (!out) {
clusterManagerLogErr("Could not save nodes to:\n%s\n", jsonpath); clusterManagerLogErr("Could not save nodes to: %s\n", jsonpath);
success = 0; success = 0;
goto cleanup; goto cleanup;
} }
@ -6172,6 +6163,11 @@ cleanup:
sdsfree(json); sdsfree(json);
sdsfree(jsonpath); sdsfree(jsonpath);
if (success) { if (success) {
if (!no_issues) {
clusterManagerLogWarn("*** Cluster seems to have some problems, "
"please be aware of it if you're going "
"to restore this backup.\n");
}
clusterManagerLogOk("[OK] Backup created into: %s\n", clusterManagerLogOk("[OK] Backup created into: %s\n",
config.cluster_manager_command.backup_dir); config.cluster_manager_command.backup_dir);
} else clusterManagerLogOk("[ERR] Failed to back cluster!\n"); } else clusterManagerLogOk("[ERR] Failed to back cluster!\n");