From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Sep 2015 18:37:37 +0000 (-0400)
Subject: osd: queue all transactions under an osr
X-Git-Tag: v9.1.0~135^2~2^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fedf360a3eddeeda641149e4f21ba5f95b6a9725;p=ceph.git

osd: queue all transactions under an osr

This was missed in e7bbafa3bfbd5e936a8be026a30b83a89f6121c3.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 46514f354c03c..76a7cf65b7b6c 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2515,7 +2515,7 @@ void OSD::clear_temp_objects()
 	dout(20) << "  removing " << *p << " object " << *q << dendl;
 	t.remove(*p, *q);
       }
-      store->apply_transaction(t);
+      store->apply_transaction(service.meta_osr.get(), t);
     }
   }
 }
@@ -6446,7 +6446,7 @@ void OSD::handle_osd_map(MOSDMap *m)
   // superblock and commit
   write_superblock(t);
   store->queue_transaction(
-    0,
+    service.meta_osr.get(),
     _t,
     new C_OnMapApply(&service, _t, pinned_maps, osdmap->get_epoch()),
     0, 0);
@@ -6537,7 +6537,7 @@ void OSD::check_osdmap_features(ObjectStore *fs)
       superblock.compat_features.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS);
       ObjectStore::Transaction *t = new ObjectStore::Transaction;
       write_superblock(*t);
-      int err = store->queue_transaction_and_cleanup(NULL, t);
+      int err = store->queue_transaction_and_cleanup(service.meta_osr.get(), t);
       assert(err == 0);
       fs->set_allow_sharded_objects();
     }