From: Somnath Roy <somnath.roy@sandisk.com>
Date: Sat, 31 May 2014 02:07:10 +0000 (-0700)
Subject: WorkQueue: The variable name is corrected.
X-Git-Tag: v0.83~110^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2dbd85c94cf27a1ff0419c5ea9359af7fe30e9b6;p=ceph.git

WorkQueue: The variable name is corrected.
Modified the variable name from shardedpol_cond->shardedpool_cond

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
---

diff --git a/src/common/WorkQueue.cc b/src/common/WorkQueue.cc
index 52508324dd9a..11cb526dc4ed 100644
--- a/src/common/WorkQueue.cc
+++ b/src/common/WorkQueue.cc
@@ -275,7 +275,7 @@ void ShardedThreadPool::shardedthreadpool_worker(uint32_t thread_index)
       wait_cond.Signal();
       while(pause_threads.read()) {
        cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
-       shardedpol_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
+       shardedpool_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
       }
       --num_paused;
       shardedpool_lock.Unlock();
@@ -287,7 +287,7 @@ void ShardedThreadPool::shardedthreadpool_worker(uint32_t thread_index)
         wait_cond.Signal();
         while (drain_threads.read()) {
           cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
-          shardedpol_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
+          shardedpool_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
         }
         --num_drained;
       }
@@ -374,7 +374,7 @@ void ShardedThreadPool::unpause()
   ldout(cct,10) << "unpause" << dendl;
   shardedpool_lock.Lock();
   pause_threads.set(0);
-  shardedpol_cond.Signal();
+  shardedpool_cond.Signal();
   shardedpool_lock.Unlock();
   ldout(cct,10) << "unpaused" << dendl;
 }
@@ -390,6 +390,7 @@ void ShardedThreadPool::drain()
     wait_cond.Wait(shardedpool_lock);
   }
   drain_threads.set(0);
+  shardedpool_cond.Signal();
   shardedpool_lock.Unlock();
   ldout(cct,10) << "drained" << dendl;
 }
diff --git a/src/common/WorkQueue.h b/src/common/WorkQueue.h
index b27ff847895c..8288c1890fc3 100644
--- a/src/common/WorkQueue.h
+++ b/src/common/WorkQueue.h
@@ -435,7 +435,7 @@ class ShardedThreadPool {
   string name;
   string lockname;
   Mutex shardedpool_lock;
-  Cond shardedpol_cond;
+  Cond shardedpool_cond;
   Cond wait_cond;
   uint32_t num_threads;
   atomic_t stop_threads;