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>

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);

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 */