summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-handler.c
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kp@gluster.com>2011-10-20 12:51:44 +0530
committerVijay Bellur <vijay@gluster.com>2011-10-28 04:58:18 -0700
commit1fd6ad3cc85fcc07a47bb0af67a0af48349392a9 (patch)
tree4e52b523b5558f03f526b730265f0b6c62fb0a83 /xlators/mgmt/glusterd/src/glusterd-handler.c
parent8a88ae6ce413dacc363cb9d5802965d8c5dca332 (diff)
glusterd: Removing delayed moving of op sm for stop vol/remove brick op.
Earlier we would wait until brick disconnect or 5s whichever was earlier, before we move op sm from brick op stage to commit stage. This involves a race where both the above mentioned events can happen 'concurrently' and result in double free of the event context. Change-Id: Ia369994448e71a052679d2373b8ab9177d56a541 BUG: 3700 Reviewed-on: http://review.gluster.com/626 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 552998ad0..f072a7004 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -3818,8 +3818,6 @@ glusterd_brick_rpc_notify (struct rpc_clnt *rpc, void *mydata,
case RPC_CLNT_DISCONNECT:
gf_log (this->name, GF_LOG_DEBUG, "got RPC_CLNT_DISCONNECT");
glusterd_set_brick_status (brickinfo, GF_BRICK_STOPPED);
- if (brickinfo->timer && brickinfo->timer->callbk)
- brickinfo->timer->callbk (brickinfo->timer->data);
break;
default: