diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2015-04-13 10:37:55 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-04-26 22:17:42 -0700 |
| commit | 540fc2829bd63a2fa070c68ed105eb23145df406 (patch) | |
| tree | 3748d71ad3c27b53b9db73b162f8ab4f93c98f93 | |
| parent | 18fd2fdd60839d737ab0ac64f33a444b54bdeee4 (diff) | |
glusterd: incorrect rsp.op_ret handling in volume get in cli
Change-Id: Iabe99c06166578fc90121e7cfdca4a6a3f5328ae
BUG: 1211132
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/10229
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 7 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 170b0f11777..e1e9ed3f393 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -9820,9 +9820,8 @@ gf_cli_get_vol_opt_cbk (struct rpc_req *req, struct iovec *iov, int count, } else { cli_err ("%s", msg); } - ret = 0; /* setting ret to 0 ensures we do not end up displaying - double error messages */ - goto out; + ret = rsp.op_ret; + goto out_nolog; } dict = dict_new (); @@ -9890,6 +9889,8 @@ out: cli_out ("volume get option failed. Check the cli/glusterd log " "file for more details"); } + +out_nolog: if (dict) dict_unref (dict); free (rsp.op_errstr); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 50c5c58bcfa..e23d2a35fe8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -9308,7 +9308,6 @@ glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, for (vme = &glusterd_volopt_map[0]; vme->key; vme++) { if (!all_opts && strcmp (vme->key, input_key)) continue; - key_found = _gf_true; /* First look for the key in the vol_dict, if its not * present then look for translator default value */ |