summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kp@gluster.com>2011-10-03 14:53:04 +0530
committerVijay Bellur <vijay@gluster.com>2011-10-05 11:44:01 -0700
commit72f80b87c40a899a5c6f838d368a80e6f9846f69 (patch)
tree33bf488a436f982c4719802cce09e72222634ccf
parent4235f7a74e0c4c637f1db2f49624a972d72b12fb (diff)
glusterd: Shouldn't inject COMMIT_ACC event before receiving ACC from all peers.
Change-Id: I88b9935f93d9a06e46c3351c2fd37c969396bb0a BUG: 3683 Reviewed-on: http://review.gluster.com/553 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 6e2ee7e5b..16a5d01e7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1921,8 +1921,10 @@ out:
if (commit_ack_inject) {
if (ret)
ret = glusterd_op_sm_inject_event (GD_OP_EVENT_RCVD_RJT, NULL);
- else
+ else if (!opinfo.pending_count)
ret = glusterd_op_sm_inject_event (GD_OP_EVENT_COMMIT_ACC, NULL);
+
+ /*else do nothing*/
}
return ret;