RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/PGLog: take ghobject_t instead of hobject_t

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2014-11-20 13:20:53 -08:00
parent be86cc739c
commit 9819221799
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osd/PGLog.cc
View File

@ -690,7 +690,7 @@ void PGLog::merge_log(ObjectStore::Transaction& t,
}
void PGLog::write_log(
ObjectStore::Transaction& t, const hobject_t &log_oid)
ObjectStore::Transaction& t, const ghobject_t &log_oid)
{
if (is_dirty()) {
dout(10) << "write_log with: "
@ -716,7 +716,7 @@ void PGLog::write_log(
}
void PGLog::write_log(ObjectStore::Transaction& t, pg_log_t &log,
const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors)
const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors)
{
_write_log(
t, log, log_oid,
@ -727,7 +727,7 @@ void PGLog::write_log(ObjectStore::Transaction& t, pg_log_t &log,
void PGLog::_write_log(
ObjectStore::Transaction& t, pg_log_t &log,
const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
eversion_t dirty_to,
eversion_t dirty_from,
eversion_t writeout_from,
@ -805,7 +805,7 @@ void PGLog::_write_log(
t.omap_setkeys(META_COLL, log_oid, keys);
}
bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
bool PGLog::read_log(ObjectStore *store, coll_t coll, ghobject_t log_oid,
const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
IndexedLog &log,
pg_missing_t &missing,
@ -934,7 +934,7 @@ bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
return rewrite_log;
}
void PGLog::read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
void PGLog::read_log_old(ObjectStore *store, coll_t coll, ghobject_t log_oid,
const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
IndexedLog &log,
pg_missing_t &missing, ostringstream &oss,

12
src/osd/PGLog.h
View File

@ -543,14 +543,14 @@ public:
pg_info_t &info, LogEntryHandler *rollbacker,
bool &dirty_info, bool &dirty_big_info);
void write_log(ObjectStore::Transaction& t, const hobject_t &log_oid);
void write_log(ObjectStore::Transaction& t, const ghobject_t &log_oid);
static void write_log(ObjectStore::Transaction& t, pg_log_t &log,
const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors);
const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors);
static void _write_log(
ObjectStore::Transaction& t, pg_log_t &log,
const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
eversion_t dirty_to,
eversion_t dirty_from,
eversion_t writeout_from,
@ -560,7 +560,7 @@ public:
set<string> *log_keys_debug
);
bool read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
bool read_log(ObjectStore *store, coll_t coll, ghobject_t log_oid,
const pg_info_t &info, ostringstream &oss) {
return read_log(
store, coll, log_oid, info, divergent_priors,
@ -569,7 +569,7 @@ public:
}
/// return true if the log should be rewritten
static bool read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
static bool read_log(ObjectStore *store, coll_t coll, ghobject_t log_oid,
const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
IndexedLog &log,
pg_missing_t &missing, ostringstream &oss,
@ -577,7 +577,7 @@ public:
);
protected:
static void read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
static void read_log_old(ObjectStore *store, coll_t coll, ghobject_t log_oid,
const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
IndexedLog &log,
pg_missing_t &missing, ostringstream &oss,