diff options
| author | Sanju Rakonde <srakonde@redhat.com> | 2018-10-07 17:44:19 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-10-24 06:02:07 +0000 |
| commit | 1be6703b1005bf572cea70f2254d7b5a8ed02351 (patch) | |
| tree | 0f0c4684e20a57996246dc0eebed90bbfaa9a7bd | |
| parent | 68299b244372b1668c1708bff15a239649226dee (diff) | |
glusterd: set integer instead of string
dict_get_str_boolean expects a integer, so we need
to set all the boolean variables as integers to
avoid log messages like below:
[2018-09-10 03:55:19.236387] I [dict.c:2838:dict_get_str_boolean] (-->/usr/local/lib/libgfrpc.so.0(rpc_clnt_reconnect+0xc2) [0x7ff7a83d0452] -->/usr/local/lib/glusterfs/4.2dev/rpc-transport/socket.so(+0x65b0) [0x7ff7a06cf5b0] -->/usr/local/lib/libglusterfs.so.0(dict_get_str_boolean+0xcf) [0x7ff7a85fc58f] ) 0-dict: key transport.socket.ignore-enoent, integer type asked, has string type [Invalid argument]
This patch addresses all such instances in glusterd.
Change-Id: I7e1979fcf381363943f4d09b94c3901c403727da
updates: bz#1193929
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index fe5a763a19e..4c5497ac206 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -2885,7 +2885,7 @@ force_push_pem_no_verify_parse(const char **words, int wordcount, dict_t *dict, ret = -1; goto out; } - ret = dict_set_uint32(dict, "force", _gf_true); + ret = dict_set_int32n(dict, "force", SLEN("force"), 1); if (ret) goto out; (*cmdi)++; @@ -4524,7 +4524,7 @@ cli_snap_create_parse(dict_t *dict, const char **words, int wordcount) } if (strcmp(words[i], "no-timestamp") == 0) { - ret = dict_set_str(dict, "no-timestamp", "true"); + ret = dict_set_int32n(dict, "no-timestamp", SLEN("no-timestamp"), 1); if (ret) { gf_log("cli", GF_LOG_ERROR, "Could not save " diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 8719bbf3fd6..e6ea9c9881d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -3114,6 +3114,7 @@ glusterd_op_stage_barrier(dict_t *dict, char **op_errstr) xlator_t *this = NULL; char *volname = NULL; glusterd_volinfo_t *vol = NULL; + char *barrier_op = NULL; GF_ASSERT(dict); this = THIS; @@ -3141,7 +3142,7 @@ glusterd_op_stage_barrier(dict_t *dict, char **op_errstr) goto out; } - ret = dict_get_str_boolean(dict, "barrier", -1); + ret = dict_get_strn(dict, "barrier", SLEN("barrier"), &barrier_op); if (ret == -1) { gf_asprintf(op_errstr, "Barrier op for volume %s not present " diff --git a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c index 87025076d27..f84a7617549 100644 --- a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c @@ -40,9 +40,8 @@ glusterd_conn_init(glusterd_conn_t *conn, char *sockpath, int frame_timeout, if (ret) goto out; - ret = dict_set_nstrn(options, "transport.socket.ignore-enoent", - SLEN("transport.socket.ignore-enoent"), "on", - SLEN("on")); + ret = dict_set_int32n(options, "transport.socket.ignore-enoent", + SLEN("transport.socket.ignore-enoent"), 1); if (ret) goto out; |