Skip to content

Commit

Permalink
mon/OSDMonitor: add comments
Browse files Browse the repository at this point in the history
Co-authored-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
  • Loading branch information
Matan-B and athanatos committed Feb 7, 2024
1 parent ba750f4 commit 685047b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
11 changes: 9 additions & 2 deletions src/mon/OSDMonitor.cc
Expand Up @@ -2280,11 +2280,18 @@ version_t OSDMonitor::get_trim_to() const
return 0;
}

/* There are two constraints on trimming:
* 1. we must not trim past the last_epoch_clean for any pg
* 2. we must not trim past the last reported epoch for any up
* osds.
*
* LastEpochClean::get_lower_bound_by_pool gives a value <= constraint 1.
* For constraint 2, we take the min over osd_epochs, which is populated with
* MOSDBeacon::version, see OSDMonitor::prepare_beacon
*/
epoch_t OSDMonitor::get_min_last_epoch_clean() const
{
auto floor = last_epoch_clean.get_lower_bound_by_pool(osdmap);
// also scan osd epochs
// don't trim past the oldest reported osd epoch
for (auto [osd, epoch] : osd_epochs) {
if (epoch < floor) {
ceph_assert(osdmap.is_up(osd));
Expand Down
20 changes: 18 additions & 2 deletions src/mon/OSDMonitor.h
Expand Up @@ -114,6 +114,12 @@ class LastEpochClean {
public:
void report(unsigned pg_num, const pg_t& pg, epoch_t last_epoch_clean);
void remove_pool(uint64_t pool);
/**
* get_lower_bound_by_pool
*
* Returns epoch e such that e <= pg.last_epoch_clean for all pgs in cluster.
* May return 0 if any pool does not have comprehensive values for all pgs.
*/
epoch_t get_lower_bound_by_pool(const OSDMap& latest) const;

void dump(Formatter *f) const;
Expand Down Expand Up @@ -639,8 +645,18 @@ class OSDMonitor : public PaxosService,

// when we last received PG stats from each osd and the osd's osd_beacon_report_interval
std::map<int, std::pair<utime_t, int>> last_osd_report;
// TODO: use last_osd_report to store the osd report epochs, once we don't
// need to upgrade from pre-luminous releases.
/**
* osd_epochs
*
* Records the MOSDBeacon::version (the osd epoch at which the OSD sent the
* beacon) of the most recent beacon recevied from each currently up OSD.
* Used in OSDMonitor::get_min_last_epoch_clean().
* Down osds are trimmed upon commit of each map
* (OSDMonitor::update_from_paxos).
*
* TODO: use last_osd_report to store the osd report epochs, once we don't
* need to upgrade from pre-luminous releases.
*/
std::map<int,epoch_t> osd_epochs;
LastEpochClean last_epoch_clean;
bool preprocess_beacon(MonOpRequestRef op);
Expand Down

0 comments on commit 685047b

Please sign in to comment.