Hi,
Jan Kara wrote:
>
> On Fri 16-05-08 19:29:15, Hidehiro Kawai wrote:
>
>>Jan Kara wrote:
>>
>>>>/*
>>>>+ * We couldn't write back some metadata buffers to the filesystem.
>>>>+ * To avoid unwritten-back metadata buffers from losing, set
>>>>+ * JFS_CP_ABORT flag and make sure that the journal space isn't
>>>>+ * cleaned. This function also aborts journaling.
>>>>+ */
>>>>+static void __journal_abort_checkpoint(journal_t *journal, int errno)
>>>>+{
>>>>+ if (is_checkpoint_aborted(journal))
>>>>+ return;
>>>>+
>>>>+ spin_lock(&journal->j_state_lock);
>>>>+ journal->j_flags |= JFS_CP_ABORT;
>>>>+ spin_unlock(&journal->j_state_lock);
>>>>+ printk(KERN_WARNING "JBD: Checkpointing failed. Some metadata blocks "
>>>>+ "are still old.\n");
>>>>+ journal_abort(journal, errno);
>>>>+}
>>
>>[snip]
>>
>>
>>>>Index: linux-2.6.26-rc2/include/linux/jbd.h
>>>>===================================================================
>>>>--- linux-2.6.26-rc2.orig/include/linux/jbd.h
>>>>+++ linux-2.6.26-rc2/include/linux/jbd.h
>>>>@@ -816,6 +816,8 @@ struct journal_s
>>>>#define JFS_FLUSHED 0x008 /* The journal superblock has been flushed */
>>>>#define JFS_LOADED 0x010 /* The journal superblock has been loaded */
>>>>#define JFS_BARRIER 0x020 /* Use IDE barriers */
>>>>+#define JFS_CP_ABORT 0x040 /* Checkpointing has failed. We don't have to
>>>>+ * clean the journal space. */
>>>>
>>>>/*
>>>> * Function declarations for the journaling transaction and buffer
>>>>@@ -1004,6 +1006,11 @@ static inline int is_journal_aborted(jou
>>>> return journal->j_flags & JFS_ABORT;
>>>>}
>>>>
>>>>+static inline int is_checkpoint_aborted(journal_t *journal)
>>>>+{
>>>>+ return journal->j_flags & JFS_CP_ABORT;
>>>>+}
>>>>+
>>>
>>> Actually, I don't think this new flag is needed (not that it would really
>>>harm anything). At least at the places where you check it you can as well
>>>check whether the journal is aborted (maybe except for journal_destroy()
>>>but see my comment there).
>>
>>As you say, JFS_CP_ABORT isn't necessarily needed in the most cases,
>>but it is needed for __journal_abort_checkpoint() which report the
>>checkpoint related error by printk only once. If we use JFS_ABORT
>>to check whether this call is second time, the error message may be
>>never printed out because the journal has been aborted by another
>>reason. If we don't check for the second call, the error message
>>will be printed out several times.
>
> Yes, I think that checking out for JFS_ABORT is the right thing to do.
> Once the journal has aborted for some reason, it is enough that we print
> some error message (and that is responsibility of the first caller of
> journal_abort()). Printing that checkpointing has not succeeded as well is
> IMO not needed.
A checkpointing failure is a bit special. If the journal is aborted
by journal_commit_transaction(), the integrity of the filesystem is
ensured although the latest changes will be lost. However, if the
journal is aborted by log_do_checkpoint() and the replay also failed,
the filesystem may be corrupted because some of the metadata blocks
are in old states. In this case, the user will have to recover the
filesystem manually and carefully. So I think printing the special
message is needed to inform users about that.
>>>>@@ -1151,7 +1151,8 @@ void journal_destroy(journal_t *journal)
>>>> journal->j_tail = 0;
>>>> journal->j_tail_sequence = ++journal->j_transaction_sequence;
>>>> if (journal->j_sb_buffer) {
>>>>- journal_update_superblock(journal, 1);
>>>>+ if (!is_checkpoint_aborted(journal))
>>>>+ journal_update_superblock(journal, 1);
>>>> brelse(journal->j_sb_buffer);
>>>> }
>>>
>>> I don't like this much. I'd rather completely avoid updating j_tail and
>>>j_tail_sequence above in case the journal is aborted but I'd write the
>>>journal superblock so that information about abortion gets written...
>>
>>log_do_checkpoint() calls cleanup_journal_tail(), which advances
>>j_tail and j_tail_sequence. So if we adopt the policy that we don't
>>modify j_tail and j_tail_sequence when checkpointing failed, we should
>>also fix cleanup_journal_tail().
>>
>>I adopted the policy that we don't update the journal super block
>>when checkpointing failed. When checkpointing failed, journal_abort()
>>is called before cleanup_journal_tail(). So what we want to write
>>should be in the journal super block.
>
> I see. The thing I'm afraid of with this policy is, that when sometime later
> we add somewhere journal_update_superblock() and forget about checking
> whether journal isn't aborted, we will magically get filesystem corruption
> when IO error happens and that would be really hard to debug. So I'd
> rather refrain from updating j_tail and j_tail_sequence.
I can understand your concern as the current JBD updates the journal
super block even if a checkpoint has failed. I think it will be
improved by adding a comment to journal_update_superblock().
For example: don't invoke this function if checkpointing has
failed, otherwise unwritten-back journaled data can be lost.
Or we may stop both modifying j_tail and updating the super block
when the journal has aborted (especially for a reason of checkpoint
failure). Of course, __journal_abort_soft() still updates the
super block once.
Thanks,
--
Hidehiro Kawai
Hitachi, Systems Development Laboratory
Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
