On Thu, Apr 13, 2023 at 05:18:15PM +0000, Klemens Nanni wrote:
> On Thu, Apr 13, 2023 at 04:43:39PM +0000, Mikolaj Kucharski wrote:
> > I have an amd64 based cheap laptop, which has extremly slow I/O and even
> > slower I/O in the installer. The result is, that fsck during upgrade,
> > triggered via sysupgrade -s, takes ages. Basically makes upgrade
> > non-usable.
>
> Resetting the watchdog between fsck runs might help, can you try that?
>
> > Would it be possible to bump it to 60 minutes?
>
> We've deliberately lowered it from 60 to 30 minutes years ago, after the
> the single timeout for the whole upgrade was split and made resettable.
So I tested your below diff and I still needed to bump
WATCHDOG_PERIOD_SEC to 45 minutes. I am not insisting on bumping to 45
minutes, but I don't see any regress by our change. If you think it is an
improvement, then I guess it can go in.
> Index: install.sub
> ===================================================================
> RCS file: /cvs/src/distrib/miniroot/install.sub,v
> retrieving revision 1.1241
> diff -u -p -r1.1241 install.sub
> --- install.sub 7 Apr 2023 13:48:42 -0000 1.1241
> +++ install.sub 13 Apr 2023 17:13:05 -0000
> @@ -2739,6 +2739,7 @@ check_fs() {
> else
> echo " OK."
> fi
> + reset_watchdog
> done </etc/fstab
>
> [[ -n $_fail ]] && exit
> @@ -3405,6 +3406,8 @@ do_upgrade() {
> fsck -fp /dev/$ROOTDEV >/dev/null 2>&1 || { echo "FAILED."; exit; }
> echo " OK."
>
> + reset_watchdog
> +
> echo -n "Mounting root filesystem (mount -o ro /dev/$ROOTDEV /mnt)..."
> mount -o ro /dev/$ROOTDEV /mnt || { echo "FAILED."; exit; }
> echo " OK."
>
--
Regards,
Mikolaj
