From ada8e004260ec755d9879219f7b3811d3e123bbf Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Fri, 11 Dec 2015 15:15:53 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/12950 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Gaurav Kumar Garg Reviewed-on: http://review.gluster.org/13490 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/mgmt/glusterd/src/glusterd-utils.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c') 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; } } -- cgit