]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: drop kraken wal replay compat
authorSage Weil <sage@redhat.com>
Thu, 24 Aug 2017 16:38:45 +0000 (12:38 -0400)
committerSage Weil <sage@redhat.com>
Tue, 29 Aug 2017 03:10:32 +0000 (23:10 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc

index 4cd6f0b86fb41e26e195273a2e5938fce3f6af54..8a44ee706c6fc712dd516efea01f12bbe00d1b00 100644 (file)
@@ -8434,15 +8434,7 @@ void BlueStore::_kv_sync_thread()
       for (auto b : deferred_stable) {
        for (auto& txc : b->txcs) {
          bluestore_deferred_transaction_t& wt = *txc.deferred_txn;
-         if (!wt.released.empty()) {
-           // kraken replay compat only
-           txc.released = wt.released;
-           dout(10) << __func__ << " deferred txn has released "
-                    << txc.released
-                    << " (we just upgraded from kraken) on " << &txc << dendl;
-           _txc_finalize_kv(&txc, synct);
-         }
-         // cleanup the deferred
+         assert(wt.released.empty()); // only kraken did this
          string key;
          get_deferred_key(wt.seq, &key);
          synct->rm_single_key(PREFIX_DEFERRED, key);