summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zafman <david.zafman@inktank.com>2013-07-31 11:10:51 -0700
committerDavid Zafman <david.zafman@inktank.com>2013-07-31 12:04:23 -0700
commitd651658d17582b601120aee246e7528e2fdb7beb (patch)
tree3d76dbf029500d553e829ba6c1e0100a6db50bca
parent5bd061c03972adcd18c74f329fde64b8947edc0d (diff)
downloadceph-d651658d17582b601120aee246e7528e2fdb7beb.tar.gz
osdc: Add asserts that client_lock is held
Clarify locking by indicating that client_lock is held Signed-off-by: David Zafman <david.zafman@inktank.com>
-rw-r--r--src/osdc/Objecter.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index b7530200298..3632ae1c24c 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -749,6 +749,7 @@ void Objecter::check_op_pool_dne(Op *op)
void Objecter::_send_op_map_check(Op *op)
{
+ assert(client_lock.is_locked());
// ask the monitor
if (check_latest_map_ops.count(op->tid) == 0) {
check_latest_map_ops[op->tid] = op;
@@ -759,6 +760,7 @@ void Objecter::_send_op_map_check(Op *op)
void Objecter::op_cancel_map_check(Op *op)
{
+ assert(client_lock.is_locked());
map<tid_t, Op*>::iterator iter =
check_latest_map_ops.find(op->tid);
if (iter != check_latest_map_ops.end()) {
@@ -1101,6 +1103,7 @@ void Objecter::tick()
void Objecter::resend_mon_ops()
{
+ assert(client_lock.is_locked());
ldout(cct, 10) << "resend_mon_ops" << dendl;
for (map<tid_t,PoolStatOp*>::iterator p = poolstat_ops.begin(); p!=poolstat_ops.end(); ++p) {