LU-13672 tune2fs: reset MMP state on error exit

If tune2fs cannot perform the requested change, ensure that the MMP
block is reset to the unused state before exiting.  Otherwise, the
filesystem will be left with mmp_seq = EXT4_MMP_SEQ_FSCK set, which
prevents it from being mounted afterward:

    LDISKFS-fs warning (device dm-9): ldiskfs_multi_mount_protect:311:
        fsck is running on the filesystem

Add a test to try some failed tune2fs operations and verify that the
MMP block is left in a clean state afterward.

Change-Id: I3a5acc5875fa2d082a66e751ec4b326ffe3ebbe5
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/38926
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 888f69e..d82762b 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -425,7 +425,7 @@ static int update_mntopts(ext2_filsys fs, char *mntopts)
        return 0;
 }
 
-static void check_fsck_needed(ext2_filsys fs, const char *prompt)
+static int check_fsck_needed(ext2_filsys fs, const char *prompt)
 {
        /* Refuse to modify anything but a freshly checked valid filesystem. */
        if (!(fs->super->s_state & EXT2_VALID_FS) ||
@@ -435,15 +435,17 @@ static void check_fsck_needed(ext2_filsys fs, const char *prompt)
                puts(_(please_fsck));
                if (mount_flags & EXT2_MF_READONLY)
                        printf("%s", _("(and reboot afterwards!)\n"));
-               exit(1);
+               return 1;
        }
 
        /* Give the admin a few seconds to bail out of a dangerous op. */
        if (!getenv("TUNE2FS_FORCE_PROMPT") && (!isatty(0) || !isatty(1)))
-               return;
+               return 0;
 
        puts(prompt);
        proceed_question(5);
+
+       return 0;
 }
 
 static void request_dir_fsck_afterwards(ext2_filsys fs)
@@ -1226,12 +1228,13 @@ mmp_error:
 
        if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
                       EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
-               check_fsck_needed(fs,
-                       _("Enabling checksums could take some time."));
+               if (check_fsck_needed(fs,
+                       _("Enabling checksums could take some time.")))
+                       return 1;
                if (mount_flags & EXT2_MF_MOUNTED) {
                        fputs(_("Cannot enable metadata_csum on a mounted "
                                "filesystem!\n"), stderr);
-                       exit(1);
+                       return 1;
                }
                if (!ext2fs_has_feature_extents(fs->super))
                        printf("%s",
@@ -1267,12 +1270,13 @@ mmp_error:
                        EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
                __u32   test_features[3];
 
-               check_fsck_needed(fs,
-                       _("Disabling checksums could take some time."));
+               if (check_fsck_needed(fs,
+                       _("Disabling checksums could take some time.")))
+                       return 1;
                if (mount_flags & EXT2_MF_MOUNTED) {
                        fputs(_("Cannot disable metadata_csum on a mounted "
                                "filesystem!\n"), stderr);
-                       exit(1);
+                       return 1;
                }
                rewrite_checksums = 1;
 
@@ -1313,7 +1317,7 @@ mmp_error:
                if (mount_flags & EXT2_MF_MOUNTED) {
                        fputs(_("Cannot enable uninit_bg on a mounted "
                                "filesystem!\n"), stderr);
-                       exit(1);
+                       return 1;
                }
 
                /* Do not enable uninit_bg when metadata_csum enabled */
@@ -1328,7 +1332,7 @@ mmp_error:
                if (mount_flags & EXT2_MF_MOUNTED) {
                        fputs(_("Cannot disable uninit_bg on a mounted "
                                "filesystem!\n"), stderr);
-                       exit(1);
+                       return 1;
                }
 
                err = disable_uninit_bg(fs,
@@ -1347,7 +1351,7 @@ mmp_error:
                if (mount_flags & EXT2_MF_MOUNTED) {
                        fprintf(stderr, _("Cannot enable 64-bit mode "
                                          "while mounted!\n"));
-                       exit(1);
+                       return 1;
                }
                ext2fs_clear_feature_64bit(sb);
                feature_64bit = 1;
@@ -1357,7 +1361,7 @@ mmp_error:
                if (mount_flags & EXT2_MF_MOUNTED) {
                        fprintf(stderr, _("Cannot disable 64-bit mode "
                                          "while mounted!\n"));
-                       exit(1);
+                       return 1;
                }
                ext2fs_set_feature_64bit(sb);
                feature_64bit = -1;
@@ -1387,7 +1391,7 @@ mmp_error:
                if (fs->super->s_inode_size == EXT2_GOOD_OLD_INODE_SIZE) {
                        fprintf(stderr, _("Cannot enable project feature; "
                                          "inode size too small.\n"));
-                       exit(1);
+                       return 1;
                }
                Q_flag = 1;
                quota_enable[PRJQUOTA] = QOPT_ENABLE;
@@ -1454,8 +1458,9 @@ mmp_error:
                                      stderr);
                                return 1;
                        }
-                       check_fsck_needed(fs, _("Recalculating checksums "
-                                               "could take some time."));
+                       if (check_fsck_needed(fs, _("Recalculating checksums "
+                                                    "could take some time.")))
+                               return 1;
                        rewrite_checksums = 1;
                }
        }
@@ -1568,7 +1573,7 @@ err:
        return 1;
 }
 
-static void handle_quota_options(ext2_filsys fs)
+static int handle_quota_options(ext2_filsys fs)
 {
        errcode_t retval;
        quota_ctx_t qctx;
@@ -1582,13 +1587,13 @@ static void handle_quota_options(ext2_filsys fs)
                        break;
        if (qtype == MAXQUOTAS)
                /* Nothing to do. */
-               return;
+               return 0;
 
        if (quota_enable[PRJQUOTA] == QOPT_ENABLE &&
            fs->super->s_inode_size == EXT2_GOOD_OLD_INODE_SIZE) {
                fprintf(stderr, _("Cannot enable project quota; "
                                  "inode size too small.\n"));
-               exit(1);
+               return 1;
        }
 
        for (qtype = 0; qtype < MAXQUOTAS; qtype++) {
@@ -1600,7 +1605,7 @@ static void handle_quota_options(ext2_filsys fs)
        if (retval) {
                com_err(program_name, retval,
                        _("while initializing quota context in support library"));
-               exit(1);
+               return 1;
        }
 
        if (qtype_bits)
@@ -1616,7 +1621,7 @@ static void handle_quota_options(ext2_filsys fs)
                                        com_err(program_name, retval,
                                                _("while updating quota limits (%d)"),
                                                qtype);
-                                       exit(1);
+                                       return 1;
                                }
                        }
                        retval = quota_write_inode(qctx, 1 << qtype);
@@ -1624,7 +1629,7 @@ static void handle_quota_options(ext2_filsys fs)
                                com_err(program_name, retval,
                                        _("while writing quota file (%d)"),
                                        qtype);
-                               exit(1);
+                               return 1;
                        }
                        /* Enable Quota feature if one of quota enabled */
                        if (!ext2fs_has_feature_quota(fs->super)) {
@@ -1642,7 +1647,7 @@ static void handle_quota_options(ext2_filsys fs)
                                com_err(program_name, retval,
                                        _("while removing quota file (%d)"),
                                        qtype);
-                               exit(1);
+                               return 1;
                        }
                        if (qtype == PRJQUOTA) {
                                ext2fs_clear_feature_project(fs->super);
@@ -1665,7 +1670,7 @@ static void handle_quota_options(ext2_filsys fs)
        }
        if (need_dirty)
                ext2fs_mark_super_dirty(fs);
-       return;
+       return 0;
 }
 
 static int option_handle_function(char *token)
@@ -2960,8 +2965,10 @@ retry_open:
                        rc = 1;
                        goto closefs;
                }
-               check_fsck_needed(fs,
+               rc = check_fsck_needed(fs,
                        _("Resizing inodes could take some time."));
+               if (rc)
+                       goto closefs;
                /*
                 * If inode resize is requested use the
                 * Undo I/O manager
@@ -3017,16 +3024,16 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
        /* Recover the journal if possible. */
        if ((open_flag & EXT2_FLAG_RW) && !(mount_flags & (EXT2_MF_BUSY | EXT2_MF_MOUNTED)) &&
            ext2fs_has_feature_journal_needs_recovery(fs->super)) {
-               errcode_t err;
-
                printf(_("Recovering journal.\n"));
-               err = ext2fs_run_ext3_journal(&fs);
-               if (err) {
-                       com_err("tune2fs", err, "while recovering journal.\n");
+               retval = ext2fs_run_ext3_journal(&fs);
+               if (retval) {
+                       com_err("tune2fs", retval,
+                               "while recovering journal.\n");
                        printf(_("Please run e2fsck -fy %s.\n"), argv[1]);
                        if (fs)
                                ext2fs_close_free(&fs);
-                       exit(1);
+                       rc = 1;
+                       goto closefs;
                }
                sb = fs->super;
        }
@@ -3130,13 +3137,13 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
                        fputs(_("Warning: label too long, truncating.\n"),
                              stderr);
                memset(sb->s_volume_name, 0, sizeof(sb->s_volume_name));
-               strncpy(sb->s_volume_name, new_label,
+               strncpy((char *)sb->s_volume_name, new_label,
                        sizeof(sb->s_volume_name));
                ext2fs_mark_super_dirty(fs);
        }
        if (M_flag) {
                memset(sb->s_last_mounted, 0, sizeof(sb->s_last_mounted));
-               strncpy(sb->s_last_mounted, new_last_mounted,
+               strncpy((char *)sb->s_last_mounted, new_last_mounted,
                        sizeof(sb->s_last_mounted));
                ext2fs_mark_super_dirty(fs);
        }
@@ -3178,7 +3185,9 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
                        rc = 1;
                        goto closefs;
                }
-               handle_quota_options(fs);
+               rc = handle_quota_options(fs);
+               if (rc)
+                       goto closefs;
        }
 
        if (U_flag) {
@@ -3190,9 +3199,11 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
                if (!ext2fs_has_feature_csum_seed(fs->super) &&
                    (ext2fs_has_feature_metadata_csum(fs->super) ||
                     ext2fs_has_feature_ea_inode(fs->super))) {
-                       check_fsck_needed(fs,
+                       rc = check_fsck_needed(fs,
                                _("Setting the UUID on this "
                                  "filesystem could take some time."));
+                       if (rc)
+                               goto closefs;
                        rewrite_checksums = 1;
                }
 
@@ -3214,7 +3225,8 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
                                        "metadata_csum_seed' and re-run this "
                                        "command.\n"), stderr);
                                try_confirm_csum_seed_support();
-                               exit(1);
+                               rc = 1;
+                               goto closefs;
                        }
 
                        /*

diff --git a/tests/t_mmp_2off/script b/tests/t_mmp_2off/script
index ccd859b..1cd0719 100644 (file)
--- a/tests/t_mmp_2off/script
+++ b/tests/t_mmp_2off/script
@@ -8,7 +8,7 @@ if [ "$status" != 0 ] ; then
        return $status
 fi
 
-$TUNE2FS -O ^mmp $TMPFILE > $test_name.log 2>&1
+$TUNE2FS -O ^mmp $TMPFILE >> $test_name.log 2>&1
 status=$?
 if [ "$status" != 0 ] ; then
        echo "tune2fs -O ^mmp failed" > $test_name.failed
@@ -16,7 +16,7 @@ if [ "$status" != 0 ] ; then
        return $status
 fi
 
-$FSCK $FSCK_OPT $TMPFILE > $test_name.log 2>&1
+$FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1
 status=$?
 if [ "$status" = 0 ] ; then
        echo "$test_name: $test_description: ok"

diff --git a/tests/t_mmp_fail/is_slow_test b/tests/t_mmp_fail/is_slow_test
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/t_mmp_fail/name b/tests/t_mmp_fail/name
new file mode 100644 (file)
index 0000000..e872dda
--- /dev/null
+++ b/tests/t_mmp_fail/name
@@ -0,0 +1 @@
+error running tune2fs with MMP

diff --git a/tests/t_mmp_fail/script b/tests/t_mmp_fail/script
new file mode 100644 (file)
index 0000000..5fa6a84
--- /dev/null
+++ b/tests/t_mmp_fail/script
@@ -0,0 +1,44 @@
+FSCK_OPT=-yf
+
+$MKE2FS -q -F -o Linux -I 128 -b 1024 -O mmp $TMPFILE 100 > $test_name.log 2>&1
+status=$?
+if [ "$status" != 0 ] ; then
+       echo "mke2fs -O mmp failed" > $test_name.failed
+       echo "$test_name: $test_description: failed"
+       return $status
+fi
+
+$TUNE2FS -O project $TMPFILE >> $test_name.log 2>&1
+status=$?
+if [ "$status" == 0 ] ; then
+       echo "'tune2fs -O project' succeeded on small inode" > $test_name.failed
+       echo "$test_name: $test_description: failed"
+       return 1
+fi
+$TUNE2FS -o bad_option $TMPFILE >> $test_name.log 2>&1
+status=$?
+if [ "$status" == 0 ] ; then
+       echo "'tune2fs -o bad_option' succeeded" > $test_name.failed
+       echo "$test_name: $test_description: failed"
+       return 1
+fi
+$E2MMPSTATUS -i $TMPFILE >> $test_name.log 2>&1
+$E2MMPSTATUS $TMPFILE >> $test_name.log 2>&1
+status=$?
+if [ "$status" != 0 ] ; then
+       echo "$TUNE2FS left MMP block in bad state" > $test_name.failed
+       echo "$test_name: $test_description: failed"
+       return $status
+fi
+
+$FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1
+status=$?
+if [ "$status" = 0 ] ; then
+       echo "$test_name: $test_description: ok"
+       touch $test_name.ok
+else
+       echo "e2fsck after MMP disable failed" > $test_name.failed
+       echo "$test_name: $test_description: failed"
+       return $status
+fi
+rm -f $TMPFILE