Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osd: fix overload of '==' operator for pg_stat_t #7842

Merged
merged 2 commits into from Mar 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/osd/osd_types.cc
Expand Up @@ -2518,6 +2518,7 @@ bool operator==(const pg_stat_t& l, const pg_stat_t& r)
l.last_fresh == r.last_fresh &&
l.last_change == r.last_change &&
l.last_active == r.last_active &&
l.last_peered == r.last_peered &&
l.last_clean == r.last_clean &&
l.last_unstale == r.last_unstale &&
l.last_undegraded == r.last_undegraded &&
Expand All @@ -2542,6 +2543,7 @@ bool operator==(const pg_stat_t& l, const pg_stat_t& r)
l.mapping_epoch == r.mapping_epoch &&
l.blocked_by == r.blocked_by &&
l.last_became_active == r.last_became_active &&
l.last_became_peered == r.last_became_peered &&
l.dirty_stats_invalid == r.dirty_stats_invalid &&
l.omap_stats_invalid == r.omap_stats_invalid &&
l.hitset_stats_invalid == r.hitset_stats_invalid &&
Expand Down
2 changes: 1 addition & 1 deletion src/osd/osd_types.h
Expand Up @@ -1766,7 +1766,7 @@ struct pg_stat_t {
utime_t last_fresh; // last reported
utime_t last_change; // new state != previous state
utime_t last_active; // state & PG_STATE_ACTIVE
utime_t last_peered; // state & PG_STATE_ACTIVE || state & PG_STATE_ACTIVE
utime_t last_peered; // state & PG_STATE_ACTIVE || state & PG_STATE_PEERED
utime_t last_clean; // state & PG_STATE_CLEAN
utime_t last_unstale; // (state & PG_STATE_STALE) == 0
utime_t last_undegraded; // (state & PG_STATE_DEGRADED) == 0
Expand Down