On 6/5/19 4:16 PM, Sheena Artrip wrote:
> When running xfs_restore with a non-rtdev dump,
> it will ignore any rtinherit flags on the destination
> and send I/O to the metadata region.
>
> Instead, detect rtinherit on the destination XFS fileystem root inode
> and use that to override the incoming inode flags.
>
> Original version of this patch missed some branches so multiple
> invocations of xfsrestore onto the same fs caused
> the rtinherit bit to get re-removed. There could be some
> additional edge cases in non-realtime to realtime workflows so
> the outstanding question would be: is it worth supporting?
Hm, interesting.
So this is a mechanism to allow dump/restore to migrate everything
to the realtime subvol? I can't decide if I like this - normally I'd
think of an xfsdump/xfsrestore session as more or less replicating the
filesystem that was dumped, and not something that will fundamentally
change what was dumped.
OTOH, we can restore onto any dir we want, and I could see the argument
that we should respect things like the rtinherit flag if that's what
the destination dir says.
One thing about the patch - the mechanism you've copied to get the root
inode number via bulkstat turns out to be broken ... it's possible
to have a non-root inode with the lowest number on the fs, unfortunately.
But, wouldn't you want to test the rtinherit flag on the target dir anyway,
not necessarily the root dir?
-Eric
> Signed-off-by: Sheena Artrip <sheena.artrip@xxxxxxxxx>
> ---
> restore/content.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 65 insertions(+)
>
> diff --git a/restore/content.c b/restore/content.c
> index 6b22965..96dd698 100644
> --- a/restore/content.c
> +++ b/restore/content.c
> @@ -670,6 +670,9 @@ struct tran {
> /* to establish critical regions while updating pers
> * inventory
> */
> + bool_t t_dstisrealtime;
> + /* to force the realtime flag on incoming inodes
> + */
> };
>
> typedef struct tran tran_t;
> @@ -1803,6 +1806,51 @@ content_init(int argc, char *argv[], size64_t vmsz)
> free_handle(fshanp, fshlen);
> }
>
> + /* determine if destination root inode has rtinherit.
> + * If so, we should force XFS_REALTIME on the incoming inodes.
> + */
> + if (persp->a.dstdirisxfspr) {
> + stat64_t rootstat;
> + xfs_fsop_bulkreq_t bulkreq;
> + int ocount = 0;
> + xfs_bstat_t *sc_rootxfsstatp;
> +
> + int rootfd = open(persp->a.dstdir, O_RDONLY);
> +
> + sc_rootxfsstatp =
> + (xfs_bstat_t *)calloc(1, sizeof(xfs_bstat_t));
> + assert(sc_rootxfsstatp);
> +
> + /* Get the inode of the destination folder */
> + int rval = fstat64(rootfd, &rootstat);
> + if (rval) {
> + (void)close(rootfd);
> + mlog(MLOG_NORMAL, _(
> + "could not stat %s\n"),
> + persp->a.dstdir);
> + return BOOL_FALSE;
> + }
> +
> + /* Get the first valid (i.e. root) inode in this fs */
> + bulkreq.lastip = (__u64 *)&rootstat.st_ino;
> + bulkreq.icount = 1;
> + bulkreq.ubuffer = sc_rootxfsstatp;
> + bulkreq.ocount = &ocount;
> + if (ioctl(rootfd, XFS_IOC_FSBULKSTAT, &bulkreq) < 0) {
> + (void)close(rootfd);
> + mlog(MLOG_ERROR,
> + _("failed to get bulkstat information
> for root inode\n"));
> + return BOOL_FALSE;
> + }
> +
> + (void)close(rootfd);
> +
> + /* test against rtinherit */
> + if((sc_rootxfsstatp->bs_xflags & XFS_XFLAG_RTINHERIT) != 0) {
> + tranp->t_dstisrealtime = true;
> + }
> + }
> +
> /* map in pers. inv. descriptors, if any. NOTE: this ptr is to be
> * referenced ONLY via the macros provided; the descriptors will be
> * occasionally remapped, causing the ptr to change.
> @@ -7270,6 +7318,10 @@ restore_file_cb(void *cp, bool_t linkpr, char
> *path1, char *path2)
> bool_t ahcs = contextp->cb_ahcs;
> stream_context_t *strctxp = (stream_context_t *)drivep->d_strmcontextp;
>
> + if (tranp->t_dstisrealtime) {
> + bstatp->bs_xflags |= XFS_XFLAG_REALTIME;
> + }
> +
> int rval;
> bool_t ok;
>
> @@ -7480,6 +7532,10 @@ restore_reg(drive_t *drivep,
> if (tranp->t_toconlypr)
> return BOOL_TRUE;
>
> + if (tranp->t_dstisrealtime) {
> + bstatp->bs_xflags |= XFS_XFLAG_REALTIME;
> + }
> +
> oflags = O_CREAT | O_RDWR;
> if (persp->a.dstdirisxfspr && bstatp->bs_xflags & XFS_XFLAG_REALTIME)
> oflags |= O_DIRECT;
> @@ -8470,6 +8526,11 @@ restore_extent(filehdr_t *fhdrp,
> }
> assert(new_off == off);
> }
> +
> + if (tranp->t_dstisrealtime) {
> + bstatp->bs_xflags |= XFS_XFLAG_REALTIME;
> + }
> +
> if ((fd != -1) && (bstatp->bs_xflags & XFS_XFLAG_REALTIME)) {
> if ((ioctl(fd, XFS_IOC_DIOINFO, &da) < 0)) {
> mlog(MLOG_NORMAL | MLOG_WARNING, _(
> @@ -8729,6 +8790,10 @@ restore_extattr(drive_t *drivep,
>
> assert(extattrbufp);
>
> + if (tranp->t_dstisrealtime) {
> + bstatp->bs_xflags |= XFS_XFLAG_REALTIME;
> + }
> +
> if (!isdirpr)
> isfilerestored = partial_check(bstatp->bs_ino,
> bstatp->bs_size);
>
> --
> 2.17.1
>
