alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-11 00:00:12 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

update reconcile_status() for separate data/metadata

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-11-15 18:20:50 -05:00
parent 9e9942f9cf
commit 61d52f85f1
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
c_src/cmd_data.c
View File

@ -410,7 +410,7 @@ static bool reconcile_status(struct printbuf *out,
{ {
bool scan_pending = read_file_u64(fs.sysfs_fd, "reconcile_scan_pending"); bool scan_pending = read_file_u64(fs.sysfs_fd, "reconcile_scan_pending");
u64 v[BCH_REBALANCE_ACCOUNTING_NR]; u64 v[BCH_REBALANCE_ACCOUNTING_NR][2];
memset(v, 0, sizeof(v)); memset(v, 0, sizeof(v));
struct bch_ioctl_query_accounting *a = struct bch_ioctl_query_accounting *a =
@ -426,22 +426,32 @@ static bool reconcile_status(struct printbuf *out,
struct disk_accounting_pos acc_k; struct disk_accounting_pos acc_k;
bpos_to_disk_accounting_pos(&acc_k, k->k.p); bpos_to_disk_accounting_pos(&acc_k, k->k.p);
v[acc_k.reconcile_work.type] = k->v.d[0]; v[acc_k.reconcile_work.type][0] = k->v.d[0];
v[acc_k.reconcile_work.type][1] = k->v.d[1];
} }
free(a); free(a);
if (!out->nr_tabstops) if (!out->nr_tabstops) {
printbuf_tabstop_push(out, 32); printbuf_tabstop_push(out, 32);
printbuf_tabstop_push(out, 12);
printbuf_tabstop_push(out, 12);
}
prt_printf(out, "Scan pending:\t%u\n", scan_pending); prt_printf(out, "Scan pending:\t%u\n", scan_pending);
prt_printf(out, "\tdata\rmetadata\r\n");
bool have_pending = scan_pending; bool have_pending = scan_pending;
for (unsigned i = 0; i < ARRAY_SIZE(v); i++) for (unsigned i = 0; i < ARRAY_SIZE(v); i++)
if (types & BIT(i)) { if (types & BIT(i)) {
prt_printf(out, " %s:\t", __bch2_reconcile_accounting_types[i]); prt_printf(out, " %s:\t", __bch2_reconcile_accounting_types[i]);
prt_human_readable_u64(out, v[i] << 9); prt_human_readable_u64(out, v[i][0] << 9);
prt_tab_rjust(out);
prt_human_readable_u64(out, v[i][1] << 9);
prt_tab_rjust(out);
prt_newline(out); prt_newline(out);
have_pending |= v[i] != 0; have_pending |= v[i][0] != 0;
have_pending |= v[i][1] != 0;
} }
return have_pending; return have_pending;

9
c_src/cmd_fs.c
View File

@ -546,16 +546,19 @@ static int fs_usage_v1_to_text(struct printbuf *out,
break; break;
case BCH_DISK_ACCOUNTING_reconcile_work: case BCH_DISK_ACCOUNTING_reconcile_work:
if (new_type) { if (new_type) {
prt_printf(out, "\nPending rebalance work:\n");
printbuf_tabstops_reset(out); printbuf_tabstops_reset(out);
printbuf_tabstop_push(out, 16); printbuf_tabstop_push(out, 32);
printbuf_tabstop_push(out, 16); printbuf_tabstop_push(out, 12);
printbuf_tabstop_push(out, 12);
prt_printf(out, "\nPending reconcile:\tdata\rmetadata\r\n");
} }
bch2_prt_reconcile_accounting_type(out, acc_k.reconcile_work.type); bch2_prt_reconcile_accounting_type(out, acc_k.reconcile_work.type);
prt_char(out, ':'); prt_char(out, ':');
prt_tab(out); prt_tab(out);
prt_units_u64(out, a->v.d[0] << 9); prt_units_u64(out, a->v.d[0] << 9);
prt_tab_rjust(out); prt_tab_rjust(out);
prt_units_u64(out, a->v.d[1] << 9);
prt_tab_rjust(out);
prt_newline(out); prt_newline(out);
break; break;
} }