From 0ac8ab9dc8963375290e85d36fe7de461e7cb3e0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 7 Sep 2016 15:25:03 -0400 Subject: [PATCH] os/bluestore: remove faulted debug hackery Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 5 ----- src/os/bluestore/BlueStore.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 279a2f17a82..5c0aeff8978 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -1800,7 +1800,6 @@ void BlueStore::ExtentMap::fault_range( { dout(30) << __func__ << " 0x" << std::hex << offset << "~" << length << std::dec << dendl; - faulted = true; auto p = seek_shard(offset); auto last = seek_shard(offset + length); while (p != shards.end()) { @@ -1835,7 +1834,6 @@ void BlueStore::ExtentMap::dirty_range( { dout(30) << __func__ << " 0x" << std::hex << offset << "~" << length << std::dec << dendl; - assert(faulted); if (shards.empty()) { dout(20) << __func__ << " mark inline shard dirty" << dendl; inline_bl.clear(); @@ -1864,7 +1862,6 @@ void BlueStore::ExtentMap::dirty_range( BlueStore::extent_map_t::iterator BlueStore::ExtentMap::find_lextent( uint64_t offset) { - assert(faulted); Extent dummy(offset); auto fp = extent_map.lower_bound(dummy); if (fp != extent_map.begin()) { @@ -1881,7 +1878,6 @@ BlueStore::extent_map_t::iterator BlueStore::ExtentMap::find_lextent( BlueStore::extent_map_t::iterator BlueStore::ExtentMap::seek_lextent( uint64_t offset) { - assert(faulted); Extent dummy(offset); auto fp = extent_map.lower_bound(dummy); if (fp != extent_map.begin()) { @@ -1895,7 +1891,6 @@ BlueStore::extent_map_t::iterator BlueStore::ExtentMap::seek_lextent( bool BlueStore::ExtentMap::has_any_lextents(uint64_t offset, uint64_t length) { - assert(faulted); Extent dummy(offset); auto fp = extent_map.lower_bound(dummy); if (fp != extent_map.begin()) { diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 61774e8149d..401b957255d 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -532,8 +532,6 @@ public: extent_map_t extent_map; ///< map of Extents to Blobs blob_map_t spanning_blob_map; ///< blobs that span shards - bool faulted = false; ///< for debug only - struct Shard { string key; ///< kv key uint32_t offset; ///< starting logical offset -- 2.39.5