diff options
| author | Krishnan Parthasarathi <kparthas@redhat.com> | 2013-03-05 14:11:02 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-03-10 21:02:11 -0700 |
| commit | 930c4ada674804a8e5d2d90e0184437afdf2d7a0 (patch) | |
| tree | 7ae2e140c1462a467ed232ab65d77877491b4736 /xlators/mgmt/glusterd/src | |
| parent | b1755efdffacf5e3023a737974e6c8ffdc569386 (diff) | |
glusterd: Fixed volume-sync in synctask codepath.
Change-Id: I2911d3ac80825310f84c5ba6bd7890e65e1ee219
BUG: 865700
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/4624
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-syncop.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c index b943d8e9487..17e7f1b8b69 100644 --- a/xlators/mgmt/glusterd/src/glusterd-syncop.c +++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c @@ -767,12 +767,14 @@ gd_commit_op_phase (struct list_head *peers, glusterd_op_t op, dict_t *op_ctx, hostname = "localhost"; goto commit_done; } - ret = glusterd_syncop_aggr_rsp_dict (op, op_ctx, rsp_dict); - if (ret) { - gf_log (this->name, GF_LOG_ERROR, "%s", - "Failed to aggregate response " - "from node/brick"); - goto out; + if (op != GD_OP_SYNC_VOLUME) { + ret = glusterd_syncop_aggr_rsp_dict (op, op_ctx, rsp_dict); + if (ret) { + gf_log (this->name, GF_LOG_ERROR, "%s", + "Failed to aggregate response " + "from node/brick"); + goto out; + } } dict_unref (rsp_dict); rsp_dict = NULL; @@ -893,9 +895,11 @@ gd_brick_op_phase (glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict, char **op goto out; } - ret = glusterd_syncop_aggr_rsp_dict (op, op_ctx, rsp_dict); - if (ret) - goto out; + if (op == GD_OP_HEAL_VOLUME) { + ret = glusterd_syncop_aggr_rsp_dict (op, op_ctx, rsp_dict); + if (ret) + goto out; + } dict_unref (rsp_dict); rsp_dict = NULL; |