diff options
| author | Sage Weil <sage@redhat.com> | 2015-09-14 20:37:37 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2015-09-14 22:33:28 +0200 |
| commit | fedf360a3eddeeda641149e4f21ba5f95b6a9725 (patch) | |
| tree | 2243ef2d092efdf7360c4150e369a2a58bb243bd /src/osd | |
| parent | Merge pull request #5901 from yuyuyu101/wip-13001 (diff) | |
| download | ceph-fedf360a3eddeeda641149e4f21ba5f95b6a9725.tar.xz ceph-fedf360a3eddeeda641149e4f21ba5f95b6a9725.zip | |
osd: queue all transactions under an osr
This was missed in e7bbafa3bfbd5e936a8be026a30b83a89f6121c3.
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/osd')
| -rw-r--r-- | src/osd/OSD.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 46514f354c0..76a7cf65b7b 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(); } |