GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-07-02 00:32:27 +02:00
Code Packages Activity

roots: make the "idle" label useful

Browse Source 
Apply the "idle" label only when the crawl is finished _and_ its
transid_max is up to date.  This makes the keyword "idle" better reflect
when bees is not only finished crawling, but also scanning the crawled
extents in the queue.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell
2025-06-18 22:52:05 -04:00
parent 504f4cda80
commit e9d4aa4586
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bees-roots.cc
View File

@ -1336,7 +1336,7 @@ BeesScanModeExtent::next_transid()
string eta_pretty = "-"; string eta_pretty = "-";
const auto &deferred_finished = deferred_map.at(subvol); const auto &deferred_finished = deferred_map.at(subvol);
const bool finished = deferred_finished.second; const bool finished = deferred_finished.second;
if (finished) { if (finished && m_roots->up_to_date(this_state)) {
eta_stamp = "idle"; eta_stamp = "idle";
} else if (time_so_far > 10 && bytenr_offset > 1024 * 1024 * 1024) { } else if (time_so_far > 10 && bytenr_offset > 1024 * 1024 * 1024) {
const time_t eta_duration = time_so_far / bytenr_norm; const time_t eta_duration = time_so_far / bytenr_norm;
@ -2311,16 +2311,20 @@ BeesCrawl::BeesCrawl(shared_ptr<BeesContext> ctx, BeesCrawlState initial_state)
} }
} }
bool
BeesRoots::up_to_date(const BeesCrawlState &bcs)
{
// If we are already at transid_max then we are up to date
return bcs.m_max_transid >= transid_max();
}
bool bool
BeesCrawl::restart_crawl_unlocked() BeesCrawl::restart_crawl_unlocked()
{ {
const auto roots = m_ctx->roots(); const auto roots = m_ctx->roots();
const auto next_transid = roots->transid_max();
auto crawl_state = get_state_end(); auto crawl_state = get_state_end();
// If we are already at transid_max then we are still finished m_finished = roots->up_to_date(crawl_state);
m_finished = crawl_state.m_max_transid >= next_transid;
if (m_finished) { if (m_finished) {
m_deferred = true; m_deferred = true;
@ -2331,7 +2335,7 @@ BeesCrawl::restart_crawl_unlocked()
// Start new crawl // Start new crawl
crawl_state.m_min_transid = crawl_state.m_max_transid; crawl_state.m_min_transid = crawl_state.m_max_transid;
crawl_state.m_max_transid = next_transid; crawl_state.m_max_transid = roots->transid_max();
crawl_state.m_objectid = 0; crawl_state.m_objectid = 0;
crawl_state.m_offset = 0; crawl_state.m_offset = 0;
crawl_state.m_started = current_time; crawl_state.m_started = current_time;

2
src/bees.h
View File

@ -588,8 +588,8 @@ class BeesRoots : public enable_shared_from_this<BeesRoots> {
void current_state_set(const BeesCrawlState &bcs); void current_state_set(const BeesCrawlState &bcs);
bool crawl_batch(shared_ptr<BeesCrawl> crawl); bool crawl_batch(shared_ptr<BeesCrawl> crawl);
void clear_caches(); void clear_caches();
shared_ptr<BeesCrawl> insert_root(const BeesCrawlState &bcs); shared_ptr<BeesCrawl> insert_root(const BeesCrawlState &bcs);
bool up_to_date(const BeesCrawlState &bcs);
friend class BeesCrawl; friend class BeesCrawl;
friend class BeesFdCache; friend class BeesFdCache;