andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli : Display error messages if virt file has been deleted or is invalid.

Browse Source 
"gluster volume set <VOLNAME> group virt" will display error message
if virt file is deleted or is invalid.

Change-Id: Icb202b6a445597fcd9a3dcef8001891f2601a115
BUG: 916127
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/4586
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Avra Sengupta 2013-02-27 16:55:09 +05:30 committed by Anand Avati
parent 67cd7b9274
commit c6b8143b9f
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cli/src/cli-cmd-parser.c
View File

@ -712,7 +712,7 @@ cli_is_key_spl (char *key)
#define GLUSTERD_DEFAULT_WORKDIR "/var/lib/glusterd"
static int
cli_add_key_group (dict_t *dict, char *key, char *value)
cli_add_key_group (dict_t *dict, char *key, char *value, char **op_errstr)
{
int ret = -1;
int opt_count = 0;
@ -726,6 +726,7 @@ cli_add_key_group (dict_t *dict, char *key, char *value)
char *tagpath = NULL;
char *buf = NULL;
char line[PATH_MAX + 256] = {0,};
char errstr[2048] = "";
FILE *fp = NULL;
ret = gf_asprintf (&tagpath, "%s/groups/%s",
@ -738,6 +739,10 @@ cli_add_key_group (dict_t *dict, char *key, char *value)
fp = fopen (tagpath, "r");
if (!fp) {
ret = -1;
snprintf(errstr, sizeof(errstr), "Unable to open file '%s'."
" Error: %s", tagpath, strerror (errno));
if (op_errstr)
*op_errstr = gf_strdup(errstr);
goto out;
}
@ -750,6 +755,10 @@ cli_add_key_group (dict_t *dict, char *key, char *value)
tok_val = strtok_r (NULL, "=", &saveptr);
if (!tok_key || !tok_val) {
ret = -1;
snprintf(errstr, sizeof(errstr), "'%s' file format "
"not valid.", tagpath);
if (op_errstr)
*op_errstr = gf_strdup(errstr);
goto out;
}
@ -771,6 +780,10 @@ cli_add_key_group (dict_t *dict, char *key, char *value)
if (!opt_count) {
ret = -1;
snprintf(errstr, sizeof(errstr), "'%s' file format "
"not valid.", tagpath);
if (op_errstr)
*op_errstr = gf_strdup(errstr);
goto out;
}
ret = dict_set_int32 (dict, "count", opt_count);
@ -791,7 +804,8 @@ out:
#undef GLUSTERD_DEFAULT_WORKDIR
int32_t
cli_cmd_volume_set_parse (const char **words, int wordcount, dict_t **options)
cli_cmd_volume_set_parse (const char **words, int wordcount, dict_t **options,
char **op_errstr)
{
dict_t *dict = NULL;
char *volname = NULL;
@ -849,7 +863,7 @@ cli_cmd_volume_set_parse (const char **words, int wordcount, dict_t **options)
goto out;
}
ret = cli_add_key_group (dict, key, value);
ret = cli_add_key_group (dict, key, value, op_errstr);
if (ret == 0)
*options = dict;
goto out;

10
cli/src/cli-cmd-volume.c
View File

@ -897,6 +897,7 @@ cli_cmd_volume_set_cbk (struct cli_state *state, struct cli_cmd_word *word,
call_frame_t *frame = NULL;
dict_t *options = NULL;
cli_local_t *local = NULL;
char *op_errstr = NULL;
proc = &cli_rpc_prog->proctable[GLUSTER_CLI_SET_VOLUME];
@ -904,9 +905,14 @@ cli_cmd_volume_set_cbk (struct cli_state *state, struct cli_cmd_word *word,
if (!frame)
goto out;
ret = cli_cmd_volume_set_parse (words, wordcount, &options);
ret = cli_cmd_volume_set_parse (words, wordcount, &options, &op_errstr);
if (ret) {
cli_usage_out (word->pattern);
if (op_errstr) {
cli_err ("%s", op_errstr);
GF_FREE (op_errstr);
} else
cli_usage_out (word->pattern);
parse_error = 1;
goto out;
}

2
cli/src/cli.h
View File

@ -229,7 +229,7 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **opt);
int32_t
cli_cmd_volume_set_parse (const char **words, int wordcount,
dict_t **options);
dict_t **options, char **op_errstr);
int32_t
cli_cmd_volume_add_brick_parse (const char **words, int wordcount,