diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-11 17:23:39 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-17 15:44:31 -0400 |
| commit | 4d746dcb2a06f5005ed69988b9ad0af3cf47051c (patch) | |
| tree | 64ddc96e322f7ee9bc6bf5c9407ad38f96b73741 | |
| parent | 710bc59e2a5cca646bb4f7726ad47b7e7486d5fd (diff) | |
bcachefs: Improve error message when alloc key doesn't match lru entry
Error messages should always print out the full key when available -
this gives us a starting point when looking through the journal to debug
what went wrong.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index 687518c4cccf..3cc5960fe37a 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -1082,6 +1082,7 @@ static int invalidate_one_bucket(struct btree_trans *trans, struct bch_dev *ca) struct bkey_s_c k; struct bkey_i_alloc_v4 *a; u64 bucket, idx; + struct printbuf buf = PRINTBUF; int ret; bch2_trans_iter_init(trans, &lru_iter, BTREE_ID_lru, @@ -1107,10 +1108,16 @@ static int invalidate_one_bucket(struct btree_trans *trans, struct bch_dev *ca) if (ret) goto out; - if (bch2_trans_inconsistent_on(idx != alloc_lru_idx(a->v), trans, - "invalidating bucket with wrong lru idx (got %llu should be %llu", - idx, alloc_lru_idx(a->v))) + if (idx != alloc_lru_idx(a->v)) { + pr_buf(&buf, "alloc key does not point back to lru entry when invalidating bucket:\n "); + + bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&a->k_i)); + pr_buf(&buf, "\n "); + bch2_bkey_val_to_text(&buf, c, k); + bch2_trans_inconsistent(trans, "%s", buf.buf); + ret = -EINVAL; goto out; + } SET_BCH_ALLOC_V4_NEED_INC_GEN(&a->v, false); a->v.gen++; @@ -1125,6 +1132,7 @@ static int invalidate_one_bucket(struct btree_trans *trans, struct bch_dev *ca) out: bch2_trans_iter_exit(trans, &alloc_iter); bch2_trans_iter_exit(trans, &lru_iter); + printbuf_exit(&buf); return ret; } |