diff options
| author | Krishnan Parthasarathi <kp@gluster.com> | 2011-10-20 12:51:44 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-10-28 04:58:18 -0700 |
| commit | 1fd6ad3cc85fcc07a47bb0af67a0af48349392a9 (patch) | |
| tree | 4e52b523b5558f03f526b730265f0b6c62fb0a83 /xlators/mgmt/glusterd/src/glusterd-op-sm.c | |
| parent | 8a88ae6ce413dacc363cb9d5802965d8c5dca332 (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-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 4dab7a653..9db4c2c19 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -6631,28 +6631,6 @@ out: } void -glusterd_op_brick_disconnect (void *data) -{ - glusterd_brickinfo_t *brickinfo = NULL; - glusterd_op_brick_rsp_ctx_t *ev_ctx = NULL; - - ev_ctx = data; - GF_ASSERT (ev_ctx); - brickinfo = ev_ctx->brickinfo; - GF_ASSERT (brickinfo); - - if (brickinfo->timer) { - gf_timer_call_cancel (THIS->ctx, brickinfo->timer); - brickinfo->timer = NULL; - gf_log ("", GF_LOG_DEBUG, - "Cancelled timer thread"); - } - - glusterd_op_sm_inject_event (GD_OP_EVENT_RCVD_ACC, ev_ctx); - glusterd_op_sm (); -} - -void glusterd_do_replace_brick (void *data) { glusterd_volinfo_t *volinfo = NULL; |