From 83c83e44403d332ffddf3b11d11124ee86f1cbdb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 14 Sep 2015 15:21:41 -0400 Subject: [PATCH] os/KeyValueStore: kill default_osr Signed-off-by: Sage Weil --- src/os/KeyValueStore.cc | 4 +--- src/os/KeyValueStore.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc index a147c0b27ab42..3328db5e56f0c 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 &tls, // set up the sequencer OpSequencer *osr; - if (!posr) - posr = &default_osr; + assert(posr); if (posr->p) { osr = static_cast(posr->p.get()); dout(5) << "queue_transactions existing " << *osr << "/" << osr->parent diff --git a/src/os/KeyValueStore.h b/src/os/KeyValueStore.h index 148083762af97..90e41ee85a171 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 op_queue; Throttle throttle_ops, throttle_bytes; Finisher op_finisher; -- 2.39.5