os/bluestore: avoid temp released interval_map for wal cleanup

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index ac99ae83c1db82abc72b68e009fc08a351128702..943efc3ae267e1c921288302afd7e97afc49a81c 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -3924,7 +3924,6 @@ void BlueStore::_kv_sync_thread()
       KeyValueDB::Transaction t = db->get_transaction();
 
       // allocations and deallocations
-      interval_set<uint64_t> released;
       for (std::deque<TransContext *>::iterator it = wal_cleaning.begin();
          it != wal_cleaning.end();
          ++it) {
@@ -3933,7 +3932,6 @@ void BlueStore::_kv_sync_thread()
          dout(20) << __func__ << " txc " << txc
            << " (post-wal) released " << txc->wal_txn->released
            << dendl;
-         released.insert(txc->wal_txn->released);
          for (interval_set<uint64_t>::iterator p =
              txc->wal_txn->released.begin();
              p != txc->wal_txn->released.end();
@@ -3941,17 +3939,11 @@ void BlueStore::_kv_sync_thread()
            dout(20) << __func__ << " release " << p.get_start()
              << "~" << p.get_len() << dendl;
            fm->release(p.get_start(), p.get_len(), t);
+           if (!g_conf->bluestore_debug_no_reuse_blocks)
+             alloc->release(p.get_start(), p.get_len());
          }
        }
       }
-      for (interval_set<uint64_t>::iterator p = released.begin();
-          p != released.end();
-          ++p) {
-       dout(20) << __func__ << " release " << p.get_start()
-                << "~" << p.get_len() << dendl;
-       if (!g_conf->bluestore_debug_no_reuse_blocks)
-         alloc->release(p.get_start(), p.get_len());
-      }
 
       vector<bluestore_extent_t> bluefs_gift_extents;
       if (bluefs) {