c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-01-25 10:12:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

zil_process_commit_list: fail better if the pool suspends in stall

Browse Source 
Make sure we properly inform the nolwb waiters of the error, and don't
keep trying.

Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Closes #17622
This commit is contained in:
Rob Norris 2025-08-12 12:47:09 +10:00 committed by Brian Behlendorf
parent f562e0f691
commit 7c9adc6858
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
module/zfs/zil.c
View File

@ -3216,15 +3216,21 @@ zil_process_commit_list(zilog_t *zilog, zil_commit_waiter_t *zcw, list_t *ilwbs)
* "next" lwb on-disk. When this happens, we must stall * "next" lwb on-disk. When this happens, we must stall
* the ZIL write pipeline; see the comment within * the ZIL write pipeline; see the comment within
* zil_commit_writer_stall() for more details. * zil_commit_writer_stall() for more details.
*
* ESHUTDOWN has to be handled carefully here. If we get it,
* then the pool suspended and zil_crash() was called, so we
* need to stop trying and just get an error back to the
* callers.
*/ */
int err = 0; int err = 0;
while ((lwb = list_remove_head(ilwbs)) != NULL) { while ((lwb = list_remove_head(ilwbs)) != NULL) {
err = zil_lwb_write_issue(zilog, lwb); if (err == 0)
if (err != 0) err = zil_lwb_write_issue(zilog, lwb);
break;
} }
if (err == 0) if (err != ESHUTDOWN)
err = zil_commit_writer_stall(zilog); err = zil_commit_writer_stall(zilog);
if (err == ESHUTDOWN)
err = SET_ERROR(EIO);
/* /*
* Additionally, we have to signal and mark the "nolwb" * Additionally, we have to signal and mark the "nolwb"
@ -3234,7 +3240,7 @@ zil_process_commit_list(zilog_t *zilog, zil_commit_waiter_t *zcw, list_t *ilwbs)
*/ */
zil_commit_waiter_t *zcw; zil_commit_waiter_t *zcw;
while ((zcw = list_remove_head(&nolwb_waiters)) != NULL) while ((zcw = list_remove_head(&nolwb_waiters)) != NULL)
zil_commit_waiter_done(zcw, 0); zil_commit_waiter_done(zcw, err);
/* /*
* And finally, we have to destroy the itx's that * And finally, we have to destroy the itx's that
@ -3242,7 +3248,7 @@ zil_process_commit_list(zilog_t *zilog, zil_commit_waiter_t *zcw, list_t *ilwbs)
* the itx's callback if one exists for the itx. * the itx's callback if one exists for the itx.
*/ */
while ((itx = list_remove_head(&nolwb_itxs)) != NULL) while ((itx = list_remove_head(&nolwb_itxs)) != NULL)
zil_itx_destroy(itx, 0); zil_itx_destroy(itx, err);
} else { } else {
ASSERT(list_is_empty(&nolwb_waiters)); ASSERT(list_is_empty(&nolwb_waiters));
ASSERT3P(lwb, !=, NULL); ASSERT3P(lwb, !=, NULL);
@ -3301,12 +3307,12 @@ zil_process_commit_list(zilog_t *zilog, zil_commit_waiter_t *zcw, list_t *ilwbs)
int err = 0; int err = 0;
while ((lwb = while ((lwb =
list_remove_head(ilwbs)) != NULL) { list_remove_head(ilwbs)) != NULL) {
err = zil_lwb_write_issue(zilog, lwb); if (err == 0)
if (err != 0) err = zil_lwb_write_issue(
break; zilog, lwb);
} }
if (err == 0) if (err != ESHUTDOWN)
zil_commit_writer_stall(zilog); (void) zil_commit_writer_stall(zilog);
} }
} }
} }