From 72f80b87c40a899a5c6f838d368a80e6f9846f69 Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Mon, 3 Oct 2011 14:53:04 +0530 Subject: 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 Reviewed-by: Vijay Bellur --- xlators/mgmt/glusterd/src/glusterd-op-sm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 6e2ee7e5..16a5d01e 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; -- cgit