xfs: reserve blocks for refcount / rmap log item recovery
PATCH 1/1 xfs: reserve blocks for refcount / rmap log item recovery
From: Darrick J. Wong <[email protected]>
During log recovery, the per-AG reservations aren't yet set up, so log recovery has to reserve enough blocks to handle all possible btree splits.
Reported-by Dave Chinner <[email protected]>
Signed-off-by Darrick J. Wong <[email protected]>
--- fs/xfs/xfs_refcount_item.c | 9 ++++++--- fs/xfs/xfs_rmap_item.c | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-)
fs/xfs/xfs_refcount_item.c +6 -3
@@ -23,6 +23,7 @@#include "xfs_log_format.h" #include "xfs_trans_resv.h" #include "xfs_bit.h" +#include "xfs_shared.h" #include "xfs_mount.h" #include "xfs_defer.h" #include "xfs_trans.h"
@@ -456,10 +457,12 @@ xfs_cui_recover(* transaction. Normally, any work that needs to be deferred * gets attached to the same defer_ops that scheduled the * refcount update. However, we're in log recovery here, so we -* we create our own defer_ops and use that to finish up any -* work that doesn't fit. +* we use the passed in defer_ops and to finish up any work that +* doesn't fit. We need to reserve enough blocks to handle a +* full btree split on either end of the refcount range. */ - error =xfs_trans_alloc (mp, &M_RES (mp)->tr_itruncate,0 ,0 ,0 , &tp); + error =xfs_trans_alloc (mp, &M_RES (mp)->tr_itruncate, + mp->m_refc_maxlevels *2 ,0 ,XFS_TRANS_RESERVE , &tp);if (error)return error; cudp =xfs_trans_get_cud (tp, cuip);
fs/xfs/xfs_rmap_item.c +3 -1
@@ -23,6 +23,7 @@#include "xfs_log_format.h" #include "xfs_trans_resv.h" #include "xfs_bit.h" +#include "xfs_shared.h" #include "xfs_mount.h" #include "xfs_defer.h" #include "xfs_trans.h"
@@ -473,7 +474,8 @@ xfs_rui_recover( } } - error =xfs_trans_alloc (mp, &M_RES (mp)->tr_itruncate,0 ,0 ,0 , &tp); + error =xfs_trans_alloc (mp, &M_RES (mp)->tr_itruncate, + mp->m_rmap_maxlevels,0 ,XFS_TRANS_RESERVE , &tp);if (error)return error; rudp =xfs_trans_get_rud (tp, ruip);
Quoted 8 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
During log recovery, the per-AG reservations aren't yet set up, so log recovery has to reserve enough blocks to handle all possible btree splits.
Reported-by Dave Chinner <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>
This appears to have fixed all the random recovery failures I was having through fstests. The logic seems sounds, too, so
Reviewed-by Dave Chinner <[email protected]>
Signature · 2 lines
Dave Chinner [email protected]