Merge pull request #10912 from stiopaa1/journal_journaltimer_moveCRemoveSet

journal: move JournalTrimmer::C_RemoveSet struct

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-09-06 16:20:54 -04:00 committed by GitHub
commit 40df120bd0
2 changed files with 17 additions and 14 deletions

View File

@ -13,6 +13,22 @@
namespace journal {
struct JournalTrimmer::C_RemoveSet : public Context {
JournalTrimmer *journal_trimmer;
uint64_t object_set;
Mutex lock;
uint32_t refs;
int return_value;
C_RemoveSet(JournalTrimmer *_journal_trimmer, uint64_t _object_set,
uint8_t _splay_width);
virtual void complete(int r);
virtual void finish(int r) {
journal_trimmer->handle_set_removed(r, object_set);
journal_trimmer->m_async_op_tracker.finish_op();
}
};
JournalTrimmer::JournalTrimmer(librados::IoCtx &ioctx,
const std::string &object_oid_prefix,
const JournalMetadataPtr &journal_metadata)

View File

@ -58,21 +58,8 @@ private:
virtual void finish(int r) {
}
};
struct C_RemoveSet : public Context {
JournalTrimmer *journal_trimmer;
uint64_t object_set;
Mutex lock;
uint32_t refs;
int return_value;
C_RemoveSet(JournalTrimmer *_journal_trimmer, uint64_t _object_set,
uint8_t _splay_width);
virtual void complete(int r);
virtual void finish(int r) {
journal_trimmer->handle_set_removed(r, object_set);
journal_trimmer->m_async_op_tracker.finish_op();
}
};
struct C_RemoveSet;
librados::IoCtx m_ioctx;
CephContext *m_cct;