From 72b57e311fe8634d26b4c56a78016f9359208443 Mon Sep 17 00:00:00 2001 From: Kaushik BV Date: Sun, 17 Apr 2011 11:21:51 +0000 Subject: cli: UI cleanup for geo-replication command * provide a unified output in case of failure of geo-replication session * provide a better formatting of the output geo-replication status command * update the help option of geo-replication command * fix few typos Signed-off-by: Kaushik BV Signed-off-by: Anand Avati BUG: 2536 (gsync service introspection) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2536 --- cli/src/cli-cmd-volume.c | 4 +-- cli/src/cli-rpc-ops.c | 56 ++++++++++++++++++++---------- xlators/mgmt/glusterd/src/glusterd-op-sm.c | 4 ++- xlators/mgmt/glusterd/src/glusterd-utils.c | 50 +++++++++++++++----------- 4 files changed, 71 insertions(+), 43 deletions(-) diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 9dc70d2ea..f6caddbc3 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1086,7 +1086,7 @@ out: dict_unref (options); if (ret && parse_err == 0) - cli_out (GEOREP" start failed"); + cli_out (GEOREP" command failed"); return ret; } @@ -1165,7 +1165,7 @@ struct cli_cmd volume_cmds[] = { "reset all the reconfigured options"}, #if (SYNCDAEMON_COMPILE) - {"volume "GEOREP" [options]", + {"volume "GEOREP" [[] ] [options]", cli_cmd_volume_gsync_set_cbk, "Geo-sync operations"}, #endif diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 1b882cd8f..aa6d80f37 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -2630,20 +2630,27 @@ gf_cli3_1_gsync_out_status (dict_t *dict) char mst[PATH_MAX] = {0, }; char slv[PATH_MAX]= {0, }; char sts[PATH_MAX] = {0, }; + char hyphens[81] = {0, }; char *mst_val = NULL; char *slv_val = NULL; char *sts_val = NULL; + cli_out ("%-20s %-50s %-10s", "MASTER", "SLAVE", "STATUS"); + + for (i=0; iworkdir); if (ret == -1) { - snprintf (msg, sizeof (msg), "failed to create the pidfile string"); + errcode = -1; goto out; } unlink (prmfile); @@ -3227,8 +3228,9 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, *tslash = '\0'; ret = mkdir (prmfile, 0777); if (ret && (errno != EEXIST)) { - snprintf (msg, sizeof (msg), "mkdir %s failed, (%s)", - prmfile, strerror (errno)); + errcode = -1; + gf_log ("", GF_LOG_WARNING, "Failed to create the" + " directory %s", prmfile); goto out; } *tslash = '/'; @@ -3240,8 +3242,7 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, GSYNC_CONF, master, slave, prmfile); if (ret <= 0) { ret = -1; - snprintf (msg, sizeof (msg), "failed to construct the " - "config set command for %s %s", master, slave); + errcode = -1; gf_log ("", GF_LOG_WARNING, "failed to construct the " "config set command for %s %s", master, slave); goto out; @@ -3249,8 +3250,7 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, ret = gf_system (cmd); if (ret) { - snprintf (msg, sizeof (msg), "failed to set the pid " - "option for %s %s", master, slave); + errcode = -1; gf_log ("", GF_LOG_WARNING, "failed to set the pid " "option for %s %s", master, slave); goto out; @@ -3267,8 +3267,7 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, if (ret != -1) ret = gf_system (cmd) ? -1 : 0; if (ret == -1) { - snprintf (msg, sizeof (msg), "failed to set status file " - "for %s %s", master, slave); + errcode = -1; gf_log ("", GF_LOG_WARNING, "failed to set status file " "for %s %s", master, slave); goto out; @@ -3277,8 +3276,7 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, ret = glusterd_gsync_get_param_file (prmfile, "log", master, slave, DEFAULT_LOG_FILE_DIRECTORY); if (ret == -1) { - snprintf (msg, sizeof (msg), "failed to construct the " - "logfile string"); + errcode = -1; goto out; } /* XXX "mkdir -p": eventually this should be made into a library routine */ @@ -3296,8 +3294,9 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, *slash = '\0'; ret = mkdir (prmfile, 0777); if (ret == -1 && errno != EEXIST) { - snprintf (msg, sizeof (msg), "mkdir %s failed, " - "(%s)", prmfile, strerror (errno)); + errcode = -1; + gf_log ("", GF_LOG_WARNING, "Failed to create" + " the directory %s", prmfile); goto out; } if (slash) { @@ -3308,8 +3307,9 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, ret = stat (prmfile, &st); if (ret == -1 || !S_ISDIR (st.st_mode)) { ret = -1; - snprintf (msg, sizeof (msg), "mkdir %s failed, " - "(%s)", prmfile, strerror (errno)); + errcode = -1; + gf_log ("", GF_LOG_WARNING, "Failed to create the" + "directory %s", prmfile); goto out; } *tslash = '/'; @@ -3323,8 +3323,7 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, if (ret != -1) ret = gf_system (cmd) ? -1 : 0; if (ret == -1) { - snprintf (msg, sizeof (msg), "failed to set status file " - "for %s %s", master, slave); + errcode = -1; gf_log ("", GF_LOG_WARNING, "failed to set status file " "for %s %s", master, slave); goto out; @@ -3336,20 +3335,29 @@ glusterd_start_gsync (char *master, char *slave, char *uuid_str, slave); if (ret <= 0) { ret = -1; + errcode = -1; goto out; } ret = gf_system (cmd); - if (ret == -1) + if (ret == -1) { + ret = snprintf (msg, sizeof (msg), GEOREP" start failed for %s " + "%s", master, slave); + if (ret <=0) + goto out; + *op_errstr = gf_strdup (msg); goto out; + } ret = 0; out: - if ((ret != 0) && (msg[0] != '\0')) { - gf_log ("glusterd", GF_LOG_ERROR, "%s", msg); + if ((ret != 0) && errcode == -1) { if (op_errstr) - *op_errstr = gf_strdup (msg); + *op_errstr = gf_strdup ("internal error, cannot start" + "the " GEOREP " session"); } + + gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); return ret; } -- cgit