diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-05-30 22:39:12 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-05-30 22:39:12 -0700 |
| commit | fbf5a242d91e293e4e24fbb94e31e163374c7912 (patch) | |
| tree | b169d33bf7c5f08bba58903379a0ac681f265e1a /src/osd/OSD.cc | |
| parent | f4eddd7be92efa2f2935f97237964c2252f9023f (diff) | |
| parent | ec7731f737bcd061d4d1189c391ccff2661ca7ee (diff) | |
| download | ceph-fbf5a242d91e293e4e24fbb94e31e163374c7912.tar.gz | |
Merge branch 'wip-5046'
Reviewed-by: Samuel Just <sam.just@inktank.com>
Diffstat (limited to 'src/osd/OSD.cc')
| -rw-r--r-- | src/osd/OSD.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 0ca3092372f..b6bdf2de409 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1829,7 +1829,7 @@ void OSD::load_pgs() PG::RecoveryCtx rctx(0, 0, 0, 0, 0, 0); pg->handle_loaded(&rctx); - dout(10) << "load_pgs loaded " << *pg << " " << pg->log << dendl; + dout(10) << "load_pgs loaded " << *pg << " " << pg->pg_log.get_log() << dendl; pg->unlock(); } dout(10) << "load_pgs done" << dendl; @@ -3034,7 +3034,7 @@ void OSD::RemoveWQ::_process(pair<PGRef, DeletingStateRef> item) return; ObjectStore::Transaction *t = new ObjectStore::Transaction; - PG::clear_info_log( + PGLog::clear_info_log( pg->info.pgid, OSD::make_infos_oid(), pg->log_oid, @@ -3645,8 +3645,10 @@ void OSD::do_command(Connection *con, tid_t tid, vector<string>& cmd, bufferlist pg->lock(); fout << *pg << std::endl; - std::map<hobject_t, pg_missing_t::item>::iterator mend = pg->missing.missing.end(); - std::map<hobject_t, pg_missing_t::item>::iterator mi = pg->missing.missing.begin(); + std::map<hobject_t, pg_missing_t::item>::const_iterator mend = + pg->pg_log.get_missing().missing.end(); + std::map<hobject_t, pg_missing_t::item>::const_iterator mi = + pg->pg_log.get_missing().missing.begin(); for (; mi != mend; ++mi) { fout << mi->first << " -> " << mi->second << std::endl; map<hobject_t, set<int> >::const_iterator mli = @@ -5756,7 +5758,7 @@ void OSD::handle_pg_trim(OpRequestRef op) } else { // primary is instructing us to trim ObjectStore::Transaction *t = new ObjectStore::Transaction; - pg->trim(*t, m->trim_to); + pg->pg_log.trim(*t, m->trim_to, pg->info, pg->log_oid); pg->dirty_info = true; pg->write_if_dirty(*t); int tr = store->queue_transaction(pg->osr.get(), t, |