From 504f4cda80b70c5a7372fd814deb7d2b3fcfbf07 Mon Sep 17 00:00:00 2001 From: Zygo Blaxell Date: Wed, 18 Jun 2025 22:16:12 -0400 Subject: [PATCH] progress: move the "idle" cell to the next cycle ETA column When all extents within a size tier have been queued, and all the extents belong to the same file, the queue might take a long time to fully process. Also, any progress that is made will be obscured by the "idle" tag in the "point" column. Move "idle" to the next cycle ETA column, since the ETA duration will be zero, and no useful information is lost since we would have "-" there anyway. Since the "point" column can now display the maximum value, lower that maximum to 999999 so that we don't use an extra column. Signed-off-by: Zygo Blaxell --- src/bees-roots.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bees-roots.cc b/src/bees-roots.cc index bdca9d7..22753d0 100644 --- a/src/bees-roots.cc +++ b/src/bees-roots.cc @@ -1337,7 +1337,7 @@ BeesScanModeExtent::next_transid() const auto &deferred_finished = deferred_map.at(subvol); const bool finished = deferred_finished.second; if (finished) { - // eta_stamp = "idle"; + eta_stamp = "idle"; } 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_time = eta_duration + eta_start; @@ -1347,7 +1347,7 @@ BeesScanModeExtent::next_transid() } const auto &mma = mes.m_map.at(subvol); const auto mma_ratio = mes_sample_size_ok ? (mma.m_bytes / double(mes.m_total)) : 1.0; - const auto posn_text = Table::Text(finished ? "idle" : astringprintf("%06d", int(floor(bytenr_norm * 1000000)))); + const auto posn_text = Table::Text(astringprintf("%06d", int(floor(bytenr_norm * 1000000)))); const auto size_text = Table::Text( mes_sample_size_ok ? pretty(fs_size * mma_ratio) : "-"); eta.insert_row(Table::endpos, vector { Table::Text(magic.m_max_size == numeric_limits::max() ? "max" : pretty(magic.m_max_size)),