xfs_spaceman: report on realtime group health

Add the realtime group status to the health reporting done by
xfs_spaceman.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/man/man8/xfs_spaceman.8 b/man/man8/xfs_spaceman.8
index 0d299132a7881b76525513801e8550febac04060..7d2d1ff94eeb55e58eab01f67a688ea4c12d57e9 100644 (file)
--- a/man/man8/xfs_spaceman.8
+++ b/man/man8/xfs_spaceman.8
@@ -91,7 +91,7 @@ The output will have the same format that
 .BR "xfs_info" "(8)"
 prints when querying a filesystem.
 .TP
-.BI "health [ \-a agno] [ \-c ] [ \-f ] [ \-i inum ] [ \-n ] [ \-q ] [ paths ]"
+.BI "health [ \-a agno] [ \-c ] [ \-f ] [ \-i inum ] [ \-n ] [ \-q ] [ \-r rgno ] [ paths ]"
 Reports the health of the given group of filesystem metadata.
 .RS 1.0i
 .PD 0
@@ -119,6 +119,9 @@ This option is disabled by default to minimize runtime.
 .B \-q
 Report only unhealthy metadata.
 .TP
+.B \-r
+Report on the health of the given realtime group.
+.TP
 .B paths
 Report on the health of the files at the given path.
 .PD

diff --git a/spaceman/health.c b/spaceman/health.c
index c4d570363fbbf1436e82c7a0f658f5c81b09856a..4281589324cd4446c8a3708dcb1b5cb960ac3191 100644 (file)
--- a/spaceman/health.c
+++ b/spaceman/health.c
@@ -132,6 +132,22 @@ static const struct flag_map ag_flags[] = {
        {0},
 };
 
+static const struct flag_map rtgroup_flags[] = {
+       {
+               .mask = XFS_RTGROUP_GEOM_SICK_SUPER,
+               .descr = "superblock",
+       },
+       {
+               .mask = XFS_RTGROUP_GEOM_SICK_BITMAP,
+               .descr = "realtime bitmap",
+       },
+       {
+               .mask = XFS_RTGROUP_GEOM_SICK_SUMMARY,
+               .descr = "realtime summary",
+       },
+       {0},
+};
+
 static const struct flag_map inode_flags[] = {
        {
                .mask = XFS_BS_SICK_INODE,
@@ -216,6 +232,25 @@ report_ag_sick(
        return 0;
 }
 
+/* Report on a rt group's health. */
+static int
+report_rtgroup_sick(
+       xfs_rgnumber_t          rgno)
+{
+       struct xfs_rtgroup_geometry rgeo = { 0 };
+       char                    descr[256];
+       int                     ret;
+
+       ret = -xfrog_rtgroup_geometry(file->xfd.fd, rgno, &rgeo);
+       if (ret) {
+               xfrog_perror(ret, "rtgroup_geometry");
+               return 1;
+       }
+       snprintf(descr, sizeof(descr) - 1, _("rtgroup %u"), rgno);
+       report_sick(descr, rtgroup_flags, rgeo.rg_sick, rgeo.rg_checked);
+       return 0;
+}
+
 /* Report on an inode's health. */
 static int
 report_inode_health(
@@ -342,7 +377,7 @@ report_bulkstat_health(
        return error;
 }
 
-#define OPT_STRING ("a:cfi:nq")
+#define OPT_STRING ("a:cfi:nqr:")
 
 /* Report on health problems in XFS filesystem. */
 static int
@@ -352,6 +387,7 @@ health_f(
 {
        unsigned long long      x;
        xfs_agnumber_t          agno;
+       xfs_rgnumber_t          rgno;
        bool                    default_report = true;
        int                     c;
        int                     ret;
@@ -399,6 +435,17 @@ health_f(
                case 'q':
                        quiet = true;
                        break;
+               case 'r':
+                       default_report = false;
+                       errno = 0;
+                       x = strtoll(optarg, NULL, 10);
+                       if (!errno && x >= NULLRGNUMBER)
+                               errno = ERANGE;
+                       if (errno) {
+                               perror("rtgroup health");
+                               return 1;
+                       }
+                       break;
                default:
                        return command_usage(&health_cmd);
                }
@@ -434,6 +481,12 @@ health_f(
                        if (ret)
                                return 1;
                        break;
+               case 'r':
+                       rgno = strtoll(optarg, NULL, 10);
+                       ret = report_rtgroup_sick(rgno);
+                       if (ret)
+                               return 1;
+                       break;
                default:
                        break;
                }
@@ -455,6 +508,11 @@ health_f(
                        if (ret)
                                return 1;
                }
+               for (rgno = 0; rgno < file->xfd.fsgeom.rgcount; rgno++) {
+                       ret = report_rtgroup_sick(rgno);
+                       if (ret)
+                               return 1;
+               }
                if (comprehensive) {
                        ret = report_bulkstat_health(NULLAGNUMBER);
                        if (ret)
@@ -485,6 +543,7 @@ health_help(void)
 " -i inum  -- Report health of a given inode number.\n"
 " -n       -- Try to report file names.\n"
 " -q       -- Only report unhealthy metadata.\n"
+" -r rgno  -- Report health of the given realtime group.\n"
 " paths    -- Report health of the given file path.\n"
 "\n"));
 
@@ -495,7 +554,7 @@ static cmdinfo_t health_cmd = {
        .cfunc = health_f,
        .argmin = 0,
        .argmax = -1,
-       .args = "[-a agno] [-c] [-f] [-i inum] [-n] [-q] [paths]",
+       .args = "[-a agno] [-c] [-f] [-i inum] [-n] [-q] [-r rgno] [paths]",
        .flags = CMD_FLAG_ONESHOT,
        .help = health_help,
 };