Bug 241072 - Space needed between "90 second watchdog..." and PID list when stopping jail.
Summary: Space needed between "90 second watchdog..." and PID list when stopping jail.
Status: In Progress
Alias: None
Product: Base System
Classification: Unclassified
Component: bin (show other bugs)
Version: 12.0-RELEASE
Hardware: amd64 Any
: --- Affects Only Me
Assignee: Ed Maste
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-10-05 06:35 UTC by Ryan
Modified: 2019-12-07 03:30 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Ryan 2019-10-05 06:35:23 UTC
After issuing `jail -r <jailname>` if a PID hangs and does not terminate in 90 seconds a message is displayed:
"90 second watchdog timer expired. Shutdown terminated."

This message is missing a space between the PID list and the message:
```
Waiting for PIDS: 31299 31296 96510 96131 90214 90213 90211 90210 90209 90208 90207 90206 90205 90204 90201 9020090 second watchdog timeout expired. Shutdown terminated.
```
Comment 1 Ed Maste freebsd_committer 2019-10-17 17:47:07 UTC
Proposed patch here: https://github.com/emaste/freebsd/commit/b06355c8190e11abc6274e5ffe34bb016d4b107b

Please let me know what you prefer for "Reported by" metadata, for example
Reported by: My Name <myname@example.com>
Comment 2 commit-hook freebsd_committer 2019-11-07 15:49:35 UTC
A commit references this bug:

Author: emaste
Date: Thu Nov  7 15:48:46 UTC 2019
New revision: 354446
URL: https://svnweb.freebsd.org/changeset/base/354446

Log:
  rc.shutdown: print a newline before watchdog timeout message

  Previously the watchdog timeout message was appended to the last entry
  in the "Waiting for PIDS" list, resulting in a message like

      Waiting for PIDS: 31299 31296 90201 9020090 second watchdog timeout
      expired. Shutdown terminated.

  Print a newline to separate the watchdog timeout message.  Also perform
  the kill before logging or echoing the message.

  PR:		241072
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Changes:
  head/libexec/rc/rc.shutdown
Comment 3 commit-hook freebsd_committer 2019-12-07 03:30:42 UTC
A commit references this bug:

Author: emaste
Date: Sat Dec  7 03:29:58 UTC 2019
New revision: 355480
URL: https://svnweb.freebsd.org/changeset/base/355480

Log:
  MFC r354446: rc.shutdown: print a newline before watchdog timeout message

  Previously the watchdog timeout message was appended to the last entry
  in the "Waiting for PIDS" list, resulting in a message like

      Waiting for PIDS: 31299 31296 90201 9020090 second watchdog timeout
      expired. Shutdown terminated.

  Print a newline to separate the watchdog timeout message.

  Also MFC 355476: rc.shutdown: kill shutdown process after logging message

  Move the kill -KILL $$ back to the pre-r354446 location at the end of
  the shutdown timeout handler.

  PR:		241072
  Sponsored by:	The FreeBSD Foundation

Changes:
_U  stable/12/
  stable/12/libexec/rc/rc.shutdown