RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: add zero_to field to PG::OndiskLog; track zeroed region of pg log

Browse Source 
Track which region of the log has been zeroed on disk.  This may be
different from tail if 'osd preserved trimmed log = false' in the config.

Only zero the portion of the log we need to.  This avoids rezeroing regions
or missing bits when 'osd preserved trimmed log' was off and is then turned
on.

Signed-off-by: Sage Weil <sage@newdream.net>
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
This commit is contained in:
Sage Weil 2012-03-08 14:29:42 -08:00
parent ed6cc47b18
commit e7e3baebd6
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osd/PG.cc
View File

@ -1911,8 +1911,15 @@ void PG::trim_ondisklog(ObjectStore::Transaction& t)
ondisklog.tail = new_tail;
if (!g_conf->osd_preserve_trimmed_log)
t.zero(coll_t::META_COLL, log_oid, 0, ondisklog.tail & ~4095);
if (!g_conf->osd_preserve_trimmed_log) {
uint64_t zt = new_tail & ~4095;
if (zt > ondisklog.zero_to) {
t.zero(coll_t::META_COLL, log_oid, ondisklog.zero_to, zt);
dout(15) << "trim_ondisklog zeroing from " << ondisklog.zero_to
<< " to " << zt << dendl;
ondisklog.zero_to = zt;
}
}
bufferlist blb(sizeof(ondisklog));
::encode(ondisklog, blb);

19
src/osd/PG.h
View File

@ -280,10 +280,11 @@ public:
public:
// ok
uint64_t tail; // first byte of log.
uint64_t head; // byte following end of log.
uint64_t head; // byte following end of log.
uint64_t zero_to; // first non-zeroed byte of log.
bool has_checksums;
OndiskLog() : tail(0), head(0) {}
OndiskLog() : tail(0), head(0), zero_to(0) {}
uint64_t length() { return head - tail; }
bool trim_to(eversion_t v, ObjectStore::Transaction& t);
@ -291,12 +292,14 @@ public:
void zero() {
tail = 0;
head = 0;
zero_to = 0;
}
void encode(bufferlist& bl) const {
ENCODE_START(3, 3, bl);
ENCODE_START(4, 3, bl);
::encode(tail, bl);
::encode(head, bl);
::encode(zero_to, bl);
ENCODE_FINISH(bl);
}
void decode(bufferlist::iterator& bl) {
@ -304,17 +307,23 @@ public:
has_checksums = (struct_v >= 2);
::decode(tail, bl);
::decode(head, bl);
if (struct_v >= 4)
::decode(zero_to, bl);
else
zero_to = 0;
DECODE_FINISH(bl);
}
void dump(Formatter *f) const {
f->dump_unsigned("head", head);
f->dump_unsigned("tail", tail);
f->dump_unsigned("zero_to", zero_to);
}
static void generate_test_instances(list<OndiskLog*>& o) {
o.push_back(new OndiskLog);
o.push_back(new OndiskLog);
o.back()->tail = 1;
o.back()->head = 2;
o.back()->tail = 2;
o.back()->head = 3;
o.back()->zero_to = 1;
}
};
WRITE_CLASS_ENCODER(OndiskLog)