diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2016-03-11 14:01:31 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2016-03-13 23:19:06 -0700 |
| commit | 1af963dc753d97efb3cbe3e5179a2148c41c9a7d (patch) | |
| tree | ae32fcf58085e3a5c8a8f1ae045c6736041d1143 | |
| parent | d9b5fef0333e63db9d3b5077968254e3ea9d2af4 (diff) | |
snapshot/cli: Keep the dict keys uniform
snapshot info was using a different dictionary key
as compared to other snapshot commands. This was
throwing a recurring error log in cli.log
Change-Id: I9eb9a4541c10a45ec7673a23c89c85a7dce9f3ec
BUG: 1316819
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/13677
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-snapshot.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 9439724f3df..e37408ddb37 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -4182,7 +4182,7 @@ cli_snap_info_parse (dict_t *dict, const char **words, int wordcount) cmd = GF_SNAP_INFO_TYPE_VOL; out: if (ret == 0) { - ret = dict_set_int32 (dict, "cmd", cmd); + ret = dict_set_int32 (dict, "sub-cmd", cmd); if (ret) { gf_log ("cli", GF_LOG_ERROR, "Could not save " "type of snapshot info"); diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c index 2b106b63d4d..18ee3743f67 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c @@ -3683,7 +3683,7 @@ glusterd_handle_snapshot_info (rpcsvc_request_t *req, glusterd_op_t op, GF_VALIDATE_OR_GOTO (this->name, dict, out); - ret = dict_get_int32 (dict, "cmd", &cmd); + ret = dict_get_int32 (dict, "sub-cmd", &cmd); if (ret) { gf_msg (this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, "Failed to get type " |