summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd.h
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kp@gluster.com>2011-10-10 18:44:41 +0530
committerVijay Bellur <vijay@gluster.com>2011-10-14 05:42:52 -0700
commit3edfb0c492d73b349d83f904c42e6edfb9678965 (patch)
tree7c0c870afe5e975e8ed093d3bc88143f582e9a81 /xlators/mgmt/glusterd/src/glusterd.h
parent513cd0d12e3b72e9a3714deeee251414e651213f (diff)
glusterd: Removing delayed moving of op sm for stop vol/remove brick op.
Earlier we waited for brick disconnect or 5s whichever is smaller, 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. Change-Id: I8b1524afded84c20d55e29cfe2579ca872d2ac26 BUG: 3700 Reviewed-on: http://review.gluster.com/575 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amar@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.h')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h
index 203f6e975..d59193e74 100644
--- a/xlators/mgmt/glusterd/src/glusterd.h
+++ b/xlators/mgmt/glusterd/src/glusterd.h
@@ -142,7 +142,6 @@ struct glusterd_brickinfo {
glusterd_store_handle_t *shandle;
gf_brick_status_t status;
struct rpc_clnt *rpc;
- gf_timer_t *timer;
int decommissioned;
};