RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-20 18:33:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/osd_types: pg_interval_t: include up_primary in pg_interval_t

Browse Source 
Nothing uses this, but it triggers a new interval, which makes it confusing
when it is not recording in the interval itself.  Let's add it now.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-04-19 22:06:48 -07:00
parent 66170f394d
commit 931ae6b8a0
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/osd/osd_types.cc
View File

@ -2102,19 +2102,20 @@ ostream &operator<<(ostream &lhs, const pg_notify_t &notify)
void pg_interval_t::encode(bufferlist& bl) const
{
ENCODE_START(3, 2, bl);
ENCODE_START(4, 2, bl);
::encode(first, bl);
::encode(last, bl);
::encode(up, bl);
::encode(acting, bl);
::encode(maybe_went_rw, bl);
::encode(primary, bl);
::encode(up_primary, bl);
ENCODE_FINISH(bl);
}
void pg_interval_t::decode(bufferlist::iterator& bl)
{
DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, bl);
DECODE_START_LEGACY_COMPAT_LEN(4, 2, 2, bl);
::decode(first, bl);
::decode(last, bl);
::decode(up, bl);
@ -2126,6 +2127,12 @@ void pg_interval_t::decode(bufferlist::iterator& bl)
if (acting.size())
primary = acting[0];
}
if (struct_v >= 4) {
::decode(up_primary, bl);
} else {
if (up.size())
up_primary = up[0];
}
DECODE_FINISH(bl);
}
@ -2142,6 +2149,7 @@ void pg_interval_t::dump(Formatter *f) const
for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
f->dump_int("osd", *p);
f->dump_int("primary", primary);
f->dump_int("up_primary", up_primary);
f->close_section();
}
@ -2194,6 +2202,7 @@ bool pg_interval_t::check_new_interval(
i.acting = old_acting;
i.up = old_up;
i.primary = old_acting_primary;
i.up_primary = old_up_primary;
if (!i.acting.empty() && i.primary != -1 &&
i.acting.size() >=

8
src/osd/osd_types.h
View File

@ -1683,8 +1683,14 @@ struct pg_interval_t {
epoch_t first, last;
bool maybe_went_rw;
int primary;
int up_primary;
pg_interval_t() : first(0), last(0), maybe_went_rw(false), primary(-1) {}
pg_interval_t()
: first(0), last(0),
maybe_went_rw(false),
primary(-1),
up_primary(-1)
{}
void encode(bufferlist& bl) const;
void decode(bufferlist::iterator& bl);