summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/syncop.c
diff options
context:
space:
mode:
authorPranith Kumar K <pranithk@gluster.com>2012-04-30 07:29:16 +0530
committerVijay Bellur <vijay@gluster.com>2012-05-03 03:50:35 -0700
commit9b3def01e4b6c7c3e6899e4ad52ee64440285f54 (patch)
tree84f305d7b80595a31e3d075407fadef56f014d82 /libglusterfs/src/syncop.c
parent170a3a411c88f6ce1662c55440a372f512e901d1 (diff)
libgluster: Fix counting, synctask state errors
When a synctask is executed in synctask_switchto, if by the time it goes to check the woken/sleep part a reply already comes and __wake is called, already running task is going to be put in runq this generates a false warning "re-running already running task". If the reply does not come before the woken/sleep check, then the running task is put in waitq which decrements env->runcount even when the task is not in runq, this leads to -ve runcount everytime a task goes from runq->switchto->waitq. This patch fixes both of them by introducing a new state for the task called SYNCTASK_SUSPEND just when the task is suspended before yeild in SYNCOP. Change-Id: Ib82182cf950f9d85b5656f6243541489a104ca3d BUG: 816551 Signed-off-by: Pranith Kumar K <pranithk@gluster.com> Reviewed-on: http://review.gluster.com/3249 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'libglusterfs/src/syncop.c')
-rw-r--r--libglusterfs/src/syncop.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index 45416c6e..cf92d9a 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -34,6 +34,7 @@ __run (struct synctask *task)
list_del_init (&task->all_tasks);
switch (task->state) {
case SYNCTASK_INIT:
+ case SYNCTASK_SUSPEND:
break;
case SYNCTASK_RUN:
gf_log (task->xl->name, GF_LOG_WARNING,
@@ -65,6 +66,7 @@ __wait (struct synctask *task)
list_del_init (&task->all_tasks);
switch (task->state) {
case SYNCTASK_INIT:
+ case SYNCTASK_SUSPEND:
break;
case SYNCTASK_RUN:
env->runcount--;