1
0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 21:35:45 +02:00

crawl: combine two messages per crawl cycle into one

Now that the polling interval is up to 30 times faster,
next_transid seems too verbose again.

Make it clearer that the interval quoted in the "Deferring..."
message is the computed transaction polling interval.

Combine "Next transid" and "Restarted crawl" into a single message.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell 2018-01-25 00:39:56 -05:00
parent 0fdae37962
commit 72857e84c0

View File

@ -727,7 +727,7 @@ BeesCrawl::next_transid()
auto transid_delta = roots->transid_re().eta_abs(crawl_state.m_max_transid + 1);
if (elapsed_time < transid_delta) {
if (!m_deferred) {
BEESLOGINFO("Deferring next transid " << transid_delta << "s in " << get_state());
BEESLOGINFO("Deferring next transid (poll interval " << transid_delta << "s) in " << get_state());
}
m_deferred = true;
BEESCOUNT(crawl_defer);
@ -735,18 +735,19 @@ BeesCrawl::next_transid()
}
// Log performance stats from the old crawl
BEESLOGINFO("Next transid in " << get_state());
auto next_transid = roots->transid_max();
BEESLOGINFO("Next transid " << next_transid << " in " << get_state());
// Start new crawl
m_deferred = false;
crawl_state.m_min_transid = crawl_state.m_max_transid;
crawl_state.m_max_transid = roots->transid_max();
crawl_state.m_max_transid = next_transid;
crawl_state.m_objectid = 0;
crawl_state.m_offset = 0;
crawl_state.m_started = current_time;
BEESCOUNT(crawl_restart);
set_state(crawl_state);
BEESLOGINFO("Restarted crawl " << get_state());
// BEESLOGINFO("Restarted crawl " << get_state());
return true;
}