diff options
author | Atin Mukherjee <amukherj@redhat.com> | 2015-12-11 15:15:53 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2016-02-23 14:14:40 -0800 |
commit | ada8e004260ec755d9879219f7b3811d3e123bbf (patch) | |
tree | dbca20ee1d7083cc7d101811c808c473e66fbbeb /xlators/mgmt/glusterd/src/glusterd-utils.c | |
parent | 89125a3618660522787b570f030b40d798e0c99b (diff) |
glusterd: correct ret code in glusterd_volume_status_copy_to_op_ctx_dict
Backport of http://review.gluster.org/12950
This patch is to supress the error log of Failed to aggregate rsp_dict where the
above function returns a non zero ret which is not required
Change-Id: If331980291bd369690257215333cea175e2042ec
BUG: 1310999
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/12950
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Gaurav Kumar Garg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/13490
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: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 5db5d0a58eb..11fe0481b77 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -8281,6 +8281,10 @@ glusterd_volume_status_copy_to_op_ctx_dict (dict_t *aggr, dict_t *rsp_dict) if (ret) goto out; } + } else { + /* Ignore the error as still the aggregation applies in + * case its a task sub command */ + ret = 0; } } |