From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Sep 2015 19:21:41 +0000 (-0400)
Subject: os/KeyValueStore: kill default_osr
X-Git-Tag: v9.1.0~135^2~2^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83c83e44403d332ffddf3b11d11124ee86f1cbdb;p=ceph.git

os/KeyValueStore: kill default_osr

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc
index a147c0b27ab4..3328db5e56f0 100644
--- a/src/os/KeyValueStore.cc
+++ b/src/os/KeyValueStore.cc
@@ -534,7 +534,6 @@ KeyValueStore::KeyValueStore(const std::string &base,
   ondisk_finisher(g_ceph_context),
   collections_lock("KeyValueStore::collections_lock"),
   lock("KeyValueStore::lock"),
-  default_osr("default"),
   throttle_ops(g_ceph_context, "keyvaluestore_ops", g_conf->keyvaluestore_queue_max_ops),
   throttle_bytes(g_ceph_context, "keyvaluestore_bytes", g_conf->keyvaluestore_queue_max_bytes),
   op_finisher(g_ceph_context),
@@ -1049,8 +1048,7 @@ int KeyValueStore::queue_transactions(Sequencer *posr, list<Transaction*> &tls,
 
   // set up the sequencer
   OpSequencer *osr;
-  if (!posr)
-    posr = &default_osr;
+  assert(posr);
   if (posr->p) {
     osr = static_cast<OpSequencer *>(posr->p.get());
     dout(5) << "queue_transactions existing " << *osr << "/" << osr->parent
diff --git a/src/os/KeyValueStore.h b/src/os/KeyValueStore.h
index 148083762af9..90e41ee85a17 100644
--- a/src/os/KeyValueStore.h
+++ b/src/os/KeyValueStore.h
@@ -429,7 +429,6 @@ class KeyValueStore : public ObjectStore,
 
   friend ostream& operator<<(ostream& out, const OpSequencer& s);
 
-  Sequencer default_osr;
   deque<OpSequencer*> op_queue;
   Throttle throttle_ops, throttle_bytes;
   Finisher op_finisher;