commit | 87ad5bbfc716199616c2a07ff735dcb7dc541bee | [log] [tgz] |
---|---|---|
author | Tim Van Patten <timvp@google.com> | Thu Sep 21 16:53:33 2023 |
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Thu Sep 21 19:48:42 2023 |
tree | c0c663b809f2677dd18231c92a2e037fb2af65fa | |
parent | 6a16d9c8cf5b54be32237e2e2637c8c4685ff2d2 [diff] |
Revert "daisydog: store daisydog output and ret value" This reverts commit 6a16d9c8cf5b54be32237e2e2637c8c4685ff2d2. Reason for revert: Breaks daisydog. `upstart.log` ``` 2023-09-21T16:51:56.353369Z WARNING kernel: [ 3.430983] init: daisydog pre-start process (976) terminated with status 2 ``` This results is daisydog not running at all: ``` dewatt-rev4 ~ # pgrep daisydog dewatt-rev4 ~ # ``` Original change's description: > daisydog: store daisydog output and ret value > > Current approach puts daisydog check command output > only to syslog skipping stderr which in turn leads > to the situation that watchdog resets are never > reported to metrics daemon. > > Fix it by storing daisydog output and return value > in separate variables for check and logging purpouse. > > BUG=b:294439578 > TEST=Check if logs appear in syslog > > Change-Id: Ic25090158d982860e1fcf63225c87d6cadceacfc > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/daisydog/+/4831511 > Commit-Queue: Grant Grundler <grundler@chromium.org> > Reviewed-by: Mike Frysinger <vapier@chromium.org> > Reviewed-by: Grant Grundler <grundler@chromium.org> > Tested-by: Lukasz Majczak <lmajczak@google.com> BUG=b:294439578 Change-Id: I6668388844acf5419a70ae23d00eaf99f905ae00 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/daisydog/+/4884049 Auto-Submit: Tim Van Patten <timvp@google.com> Tested-by: Tim Van Patten <timvp@google.com> Owners-Override: Mike Frysinger <vapier@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Mike Frysinger <vapier@chromium.org>
GPL Code is copied with explicit permission from Daniel Widyanto:
http://embeddedfreak.wordpress.com/2010/08/23/howto-use-linux-watchdog/
The project name is based on Samsung's “daisy” reference board design and I liked this quote from the daisy dog FAQ:
Daisy Dogs are not persnickety little ankle biters
When this daisydog doesn't run, the machine should reset. :)
An alternative code to start with would have been:
https://dev.openwrt.org/ticket/2270
The watchdog project is alot more complicated than what the Chromium OS project needs.