]> www.infradead.org Git - users/hch/xfsprogs.git/commitdiff
xfs_repair: reserve per-AG space while rebuilding rt metadata
authorDarrick J. Wong <djwong@kernel.org>
Wed, 3 Jul 2024 21:22:25 +0000 (14:22 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Tue, 9 Jul 2024 22:37:21 +0000 (15:37 -0700)
Realtime metadata btrees can consume quite a bit of space on a full
filesystem.  Since the metadata are just regular files, we need to
make the per-AG reservations to avoid overfilling any of the AGs while
rebuilding metadata.  This avoids the situation where a filesystem comes
straight from repair and immediately trips over not having enough space
in an AG.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
include/libxfs.h
repair/phase6.c

index 9fc70aa6b93a94975b341aef6ef4cab850a3443e..91536397b3f4f40a7ad7500732c609884e1b96aa 100644 (file)
@@ -97,6 +97,7 @@ struct iomap;
 #include "xfs_rtbitmap.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtrmap_btree.h"
+#include "xfs_ag_resv.h"
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
index 244d4b33ddff82aa1fec3c1281dbbbd3d7cb0e23..7307eab9c83a3d407ecc49c39dadebec5a12b9c9 100644 (file)
@@ -3729,10 +3729,43 @@ reset_rt_metadata_inodes(
        }
 }
 
+static int
+reserve_ag_blocks(
+       struct xfs_mount        *mp)
+{
+       struct xfs_perag        *pag;
+       xfs_agnumber_t          agno;
+       int                     error = 0;
+       int                     err2;
+
+       mp->m_finobt_nores = false;
+
+       for_each_perag(mp, agno, pag) {
+               err2 = -libxfs_ag_resv_init(pag, NULL);
+               if (err2 && !error)
+                       error = err2;
+       }
+
+       return error;
+}
+
+static void
+unreserve_ag_blocks(
+       struct xfs_mount        *mp)
+{
+       struct xfs_perag        *pag;
+       xfs_agnumber_t          agno;
+
+       for_each_perag(mp, agno, pag)
+               libxfs_ag_resv_free(pag);
+}
+
 void
 phase6(xfs_mount_t *mp)
 {
        ino_tree_node_t         *irec;
+       bool                    reserve_perag;
+       int                     error;
        int                     i;
 
        parent_ptr_init(mp);
@@ -3777,6 +3810,17 @@ phase6(xfs_mount_t *mp)
                do_warn(_("would reinitialize metadata root directory\n"));
        }
 
+       reserve_perag = xfs_has_realtime(mp) && !no_modify;
+       if (reserve_perag) {
+               error = reserve_ag_blocks(mp);
+               if (error) {
+                       if (error != ENOSPC)
+                               do_warn(
+       _("could not reserve per-AG space to rebuild realtime metadata"));
+                       reserve_perag = false;
+               }
+       }
+
        if (need_rbmino)  {
                if (!no_modify)  {
                        do_warn(_("reinitializing realtime bitmap inode\n"));
@@ -3813,6 +3857,9 @@ _("        - resetting contents of realtime bitmap and summary inodes\n"));
                }
        }
 
+       if (reserve_perag)
+               unreserve_ag_blocks(mp);
+
        mark_standalone_inodes(mp);
 
        do_log(_("        - traversing filesystem ...\n"));