Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

zil_fail: handle failure when previous failure not cleaned up yet 

After the ZIL is reopened, itxs created before the failure are held on
the failure itxg until the cleaner thread comes through and cleans them
up by calling zil_clean(). That's an asynchronous job, so may not run
immediately.

Previously, if the ZIL fails again while there are still itxs on the
fail list, it would trip assertions in debug mode, and in production,
the itx list would be leaked and the previous outstanding fsync() calls
would be lost.

This commit makes it so that if the ZIL fails before the previous
failure has been cleaned up, it will be immediately cleaned up before
being filled with currently outstanding itxs.

Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
This commit is contained in:
Rob Norris 2023-08-28 19:58:25 +10:00 committed by Geoff Amey
parent 27e39dd59a
commit 97b5e0bbbd
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
module/zfs/zil.c
View File

@ -1038,6 +1038,7 @@ zil_failed(zilog_t *zilog)
static void zil_commit_waiter_skip(zil_commit_waiter_t *zcw); static void zil_commit_waiter_skip(zil_commit_waiter_t *zcw);
static itxs_t *zil_alloc_itxs(void); static itxs_t *zil_alloc_itxs(void);
static void zil_itxg_clean_failed(zilog_t *zilog, uint64_t synced_txg);
/* /*
* Fail the ZIL. This will collect up all failed itxs, and note that the ZIL * Fail the ZIL. This will collect up all failed itxs, and note that the ZIL
@ -1135,8 +1136,18 @@ zil_fail(zilog_t *zilog)
mutex_exit(&itxg->itxg_lock); mutex_exit(&itxg->itxg_lock);
} }
/*
* Anything left in the failed itx must be from a previous failure
* in the past. We force it to empty out (signalling waiters) here
* so that we can properly calculate the new resume txg without
* having to scan the fail itx list. Those things have waited for
* zil_clean() to service them for a while already anyway.
*/
if (fail_itxg->itxg_txg > 0) {
zil_itxg_clean_failed(zilog, last_synced_txg);
ASSERT3U(fail_itxg->itxg_txg, ==, 0); ASSERT3U(fail_itxg->itxg_txg, ==, 0);
ASSERT3P(fail_itxg->itxg_itxs, ==, NULL); ASSERT3P(fail_itxg->itxg_itxs, ==, NULL);
}
fail_itxg->itxg_itxs = zil_alloc_itxs(); fail_itxg->itxg_itxs = zil_alloc_itxs();
@ -2476,17 +2487,9 @@ zil_itxg_clean_failed(zilog_t *zilog, uint64_t synced_txg)
{ {
itxg_t *fail_itxg = &zilog->zl_fail_itxg; itxg_t *fail_itxg = &zilog->zl_fail_itxg;
/* ASSERT(MUTEX_HELD(&fail_itxg->itxg_lock));
* If zil_fail() is currently running, we will pause here until its
* done. If its not (ie most of the time), we're the only one checking,
* once per txg sync, so we should always get the lock without fuss.
*/
mutex_enter(&fail_itxg->itxg_lock);
if (fail_itxg->itxg_txg == 0 || fail_itxg->itxg_txg > synced_txg) {
mutex_exit(&fail_itxg->itxg_lock);
return;
}
ASSERT3U(fail_itxg->itxg_txg, >, 0);
ASSERT3U(fail_itxg->itxg_txg, <=, synced_txg); ASSERT3U(fail_itxg->itxg_txg, <=, synced_txg);
uint64_t next_txg = UINT64_MAX; uint64_t next_txg = UINT64_MAX;
@ -2516,7 +2519,7 @@ zil_itxg_clean_failed(zilog_t *zilog, uint64_t synced_txg)
fail_itxg->itxg_txg = 0; fail_itxg->itxg_txg = 0;
} }
mutex_exit(&fail_itxg->itxg_lock); ASSERT(MUTEX_HELD(&fail_itxg->itxg_lock));
} }
/* /*
@ -2530,15 +2533,21 @@ void
zil_clean(zilog_t *zilog, uint64_t synced_txg) zil_clean(zilog_t *zilog, uint64_t synced_txg)
{ {
itxg_t *itxg = &zilog->zl_itxg[synced_txg & TXG_MASK]; itxg_t *itxg = &zilog->zl_itxg[synced_txg & TXG_MASK];
itxg_t *fail_itxg = &zilog->zl_fail_itxg;
itxs_t *clean_me; itxs_t *clean_me;
ASSERT3U(synced_txg, <, ZILTEST_TXG); ASSERT3U(synced_txg, <, ZILTEST_TXG);
/* /*
* First clean up the failed itxg if it has anything for this txg or * If zil_fail() is currently running, we will pause here until its
* any before it. * done. If its not (ie most of the time), we're the only one checking,
* once per txg sync, so we should always get the lock without fuss.
*/ */
mutex_enter(&fail_itxg->itxg_lock);
if (fail_itxg->itxg_txg > 0 && fail_itxg->itxg_txg <= synced_txg)
/* We've moved past the restart point, so prune any old itxs. */
zil_itxg_clean_failed(zilog, synced_txg); zil_itxg_clean_failed(zilog, synced_txg);
mutex_exit(&fail_itxg->itxg_lock);
mutex_enter(&itxg->itxg_lock); mutex_enter(&itxg->itxg_lock);
if (itxg->itxg_itxs == NULL || itxg->itxg_txg == ZILTEST_TXG) { if (itxg->itxg_itxs == NULL || itxg->itxg_txg == ZILTEST_TXG) {