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

Update bcachefs sources to 586e7c5498 bcachefs: Improve journal_read() logging

Browse Source
This commit is contained in:
Kent Overstreet 2022-11-19 21:29:01 -05:00
parent effa4c9432
commit 505230a110
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
4366ca365f2c7473939dd361852fff9a144cb5d0 586e7c5498345c048985f6864f07ce36adde48be

26
libbcachefs/journal_io.c
View File

@ -1107,7 +1107,6 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq)
struct bch_dev *ca; struct bch_dev *ca;
unsigned iter; unsigned iter;
struct printbuf buf = PRINTBUF; struct printbuf buf = PRINTBUF;
size_t keys = 0, entries = 0;
bool degraded = false; bool degraded = false;
u64 seq, last_seq = 0; u64 seq, last_seq = 0;
int ret = 0; int ret = 0;
@ -1138,7 +1137,8 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq)
if (jlist.ret) if (jlist.ret)
return jlist.ret; return jlist.ret;
*start_seq = 0; *start_seq = 0;
*blacklist_seq = 0;
/* /*
* Find most recent flush entry, and ignore newer non flush entries - * Find most recent flush entry, and ignore newer non flush entries -
@ -1151,7 +1151,7 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq)
continue; continue;
if (!*start_seq) if (!*start_seq)
*start_seq = le64_to_cpu(i->j.seq) + 1; *blacklist_seq = *start_seq = le64_to_cpu(i->j.seq) + 1;
if (!JSET_NO_FLUSH(&i->j)) { if (!JSET_NO_FLUSH(&i->j)) {
int write = READ; int write = READ;
@ -1181,6 +1181,13 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq)
goto err; goto err;
} }
bch_info(c, "journal read done, replaying entries %llu-%llu",
last_seq, *blacklist_seq - 1);
if (*start_seq != *blacklist_seq)
bch_info(c, "dropped unflushed entries %llu-%llu",
*blacklist_seq, *start_seq - 1);
/* Drop blacklisted entries and entries older than last_seq: */ /* Drop blacklisted entries and entries older than last_seq: */
genradix_for_each(&c->journal_entries, radix_iter, _i) { genradix_for_each(&c->journal_entries, radix_iter, _i) {
i = *_i; i = *_i;
@ -1253,8 +1260,6 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq)
} }
genradix_for_each(&c->journal_entries, radix_iter, _i) { genradix_for_each(&c->journal_entries, radix_iter, _i) {
struct jset_entry *entry;
struct bkey_i *k, *_n;
struct bch_replicas_padded replicas = { struct bch_replicas_padded replicas = {
.e.data_type = BCH_DATA_journal, .e.data_type = BCH_DATA_journal,
.e.nr_required = 1, .e.nr_required = 1,
@ -1304,18 +1309,7 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq)
if (ret) if (ret)
goto err; goto err;
} }
for_each_jset_key(k, _n, entry, &i->j)
keys++;
entries++;
} }
bch_info(c, "journal read done, %zu keys in %zu entries, seq %llu",
keys, entries, *start_seq);
if (*start_seq != *blacklist_seq)
bch_info(c, "dropped unflushed entries %llu-%llu",
*blacklist_seq, *start_seq - 1);
err: err:
fsck_err: fsck_err:
printbuf_exit(&buf); printbuf_exit(&buf);