From f66fe7783eb61bcd6ade00133bed55839e3784a4 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Thu, 6 Dec 2012 16:27:07 -0800
Subject: [PATCH] os/JournalingObjectStore: simplify op_submitting sanity check

A list is overkill; just use a seq and make sure it increments to ensure
the op_submit_finish calls are in order.

Signed-off-by: Sage Weil <sage@inktank.com>
---
 src/os/JournalingObjectStore.cc | 8 +++-----
 src/os/JournalingObjectStore.h  | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc
index 6413c70f13879..b91b6dc207c4d 100644
--- a/src/os/JournalingObjectStore.cc
+++ b/src/os/JournalingObjectStore.cc
@@ -138,20 +138,18 @@ uint64_t JournalingObjectStore::SubmitManager::op_submit_start()
   lock.Lock();
   uint64_t op = ++op_seq;
   dout(10) << "op_submit_start " << op << dendl;
-  ops_submitting.push_back(op);
   return op;
 }
 
 void JournalingObjectStore::SubmitManager::op_submit_finish(uint64_t op)
 {
   dout(10) << "op_submit_finish " << op << dendl;
-  if (op != ops_submitting.front()) {
-    dout(0) << "op_submit_finish " << op << " expected "
-	    << ops_submitting.front()
+  if (op != op_submitted + 1) {
+    dout(0) << "op_submit_finish " << op << " expected " << (op_submitted + 1)
 	    << ", OUT OF ORDER" << dendl;
     assert(0 == "out of order op_submit_finish");
   }
-  ops_submitting.pop_front();
+  op_submitted = op;
   lock.Unlock();
 }
 
diff --git a/src/os/JournalingObjectStore.h b/src/os/JournalingObjectStore.h
index 92be2245b9cfb..338ac87ec2162 100644
--- a/src/os/JournalingObjectStore.h
+++ b/src/os/JournalingObjectStore.h
@@ -28,17 +28,17 @@ protected:
   class SubmitManager {
     Mutex lock;
     uint64_t op_seq;
-    list<uint64_t> ops_submitting;
+    uint64_t op_submitted;
   public:
     SubmitManager() :
       lock("JOS::SubmitManager::lock", false, true, false, g_ceph_context),
-      op_seq(0)
+      op_seq(0), op_submitted(0)
     {}
     uint64_t op_submit_start();
     void op_submit_finish(uint64_t op);
     void set_op_seq(uint64_t seq) {
       Mutex::Locker l(lock);
-      op_seq = seq;
+      op_submitted = op_seq = seq;
     }
     uint64_t get_op_seq() {
       return op_seq;
-- 
2.39.5