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

cmd_list_journal: Indicate which journal entries are blacklisted

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-03-01 14:21:20 -05:00
parent 87f685d129
commit 465e90314c
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cmd_debug.c
View File

@ -18,6 +18,7 @@
#include "libbcachefs/error.h" #include "libbcachefs/error.h"
#include "libbcachefs/journal.h" #include "libbcachefs/journal.h"
#include "libbcachefs/journal_io.h" #include "libbcachefs/journal_io.h"
#include "libbcachefs/journal_seq_blacklist.h"
#include "libbcachefs/super.h" #include "libbcachefs/super.h"
static void dump_usage(void) static void dump_usage(void)
@ -577,6 +578,17 @@ static void list_journal_usage(void)
"Report bugs to <linux-bcache@vger.kernel.org>"); "Report bugs to <linux-bcache@vger.kernel.org>");
} }
static void star_start_of_lines(char *buf)
{
char *p = buf;
if (*p == ' ')
*p = '*';
while ((p = strstr(p, "\n ")))
p[1] = '*';
}
int cmd_list_journal(int argc, char *argv[]) int cmd_list_journal(int argc, char *argv[])
{ {
struct bch_opts opts = bch2_opts_empty(); struct bch_opts opts = bch2_opts_empty();
@ -610,21 +622,34 @@ int cmd_list_journal(int argc, char *argv[])
struct journal_replay *p; struct journal_replay *p;
struct jset_entry *entry; struct jset_entry *entry;
struct printbuf buf = PRINTBUF;
list_for_each_entry(p, &c->journal_entries, list) { list_for_each_entry(p, &c->journal_entries, list) {
struct printbuf buf = PRINTBUF; bool blacklisted =
bch2_journal_seq_is_blacklisted(c,
le64_to_cpu(p->j.seq), false);
bch2_journal_ptrs_to_text(&buf, c, p);
printf("journal entry %llu\n" if (blacklisted)
" version %u\n" printf("blacklisted ");
" last seq %llu\n"
" written at %s\n" printf("journal entry %llu\n", le64_to_cpu(p->j.seq));
,
le64_to_cpu(p->j.seq), printbuf_reset(&buf);
pr_buf(&buf,
" version %u\n"
" last seq %llu\n"
" flush %u\n"
" written at ",
le32_to_cpu(p->j.version), le32_to_cpu(p->j.version),
le64_to_cpu(p->j.last_seq), le64_to_cpu(p->j.last_seq),
buf.buf); !JSET_NO_FLUSH(&p->j));
bch2_journal_ptrs_to_text(&buf, c, p);
if (blacklisted)
star_start_of_lines(buf.buf);
printf("%s\n", buf.buf);
vstruct_for_each(&p->j, entry) { vstruct_for_each(&p->j, entry) {
printbuf_reset(&buf); printbuf_reset(&buf);
@ -636,12 +661,14 @@ int cmd_list_journal(int argc, char *argv[])
pr_indent_push(&buf, pr_indent_push(&buf,
entry->type == BCH_JSET_ENTRY_log ? 2 : 4); entry->type == BCH_JSET_ENTRY_log ? 2 : 4);
bch2_journal_entry_to_text(&buf, c, entry); bch2_journal_entry_to_text(&buf, c, entry);
if (blacklisted)
star_start_of_lines(buf.buf);
printf("%s\n", buf.buf); printf("%s\n", buf.buf);
} }
printbuf_exit(&buf);
} }
printbuf_exit(&buf);
bch2_fs_stop(c); bch2_fs_stop(c);
return 0; return 0;
} }