mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-15 23:51:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

chromium-os:17680 : Establish Syncer PID file invariants

Browse Source 
Details

  This change updates the use of '-s' to have the proper polarity to
  see if the syncer PID file is zero bytes in size.

  As a bit of other cleanup, if a file of size zero is found, it's
  removed.  This allows the second size test of the syncer PID file to
  be removed.

Testing

  o Created zero-length PID file: saw warning message on console.  Saw
    that the file contains a valid pin while the chroot is entered,
    and verified the PID file is deleted after exiting chroot.

       INFO    : You may have suffered from chromium-os:17680 and
       INFO    : could have stray 'enter_chroot.sh' processes running.
       INFO    : Erroneous PID file will be cleaned up.

  o Entered chroot with multiple terminals, saw that the PID file is
    removed & the syncer process is killed when the last client exits
    the chroot.

  o Executed './enter_chroot.sh --verbose', changed ownership of PID file to
    'root'.

    Exited and did not see the following diagnostic message:

       INFO    : Unable to clean up syncer process.

    The message should not be printed because the file is removed
    under 'sudo'.

BUG=chromium-os:17680
TEST=See above.
Signed-off-by: Taylor Hutt <thutt@chromium.org>

Change-Id: I055fe72b9322acee8c774401b3452ef502b30970
Reviewed-on: http://gerrit.chromium.org/gerrit/4936
Tested-by: Taylor Hutt <thutt@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
This commit is contained in:
Taylor Hutt 2011-07-28 11:45:50 -07:00
parent 09e87bca4f
commit 18594a87ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
enter_chroot.sh
View File

@ -217,15 +217,15 @@ function setup_env {
# restart. # restart.
# #
# The daemon is killed by the enter_chroot that exits last. # The daemon is killed by the enter_chroot that exits last.
if [ -f "${SYNCERPIDFILE}" ] && [ -s "${SYNCERPIDFILE}" ] ; then if [ -f "${SYNCERPIDFILE}" ] && [ ! -s "${SYNCERPIDFILE}" ] ; then
info "You may have suffered from chromium-os:17680 and"; info "You may have suffered from chromium-os:17680 and";
info "could have stray 'enter_chroot.sh' processes running."; info "could have stray 'enter_chroot.sh' processes running.";
info "You must manually kill any such stray processes."; info "You must manually kill any such stray processes.";
info "Exit all chroot shells; remaining 'enter_chroot.sh'"; info "Exit all chroot shells; remaining 'enter_chroot.sh'";
info "processes are probably stray."; info "processes are probably stray.";
sudo rm -f "${SYNCERPIDFILE}";
fi; fi;
if ! [ -f "${SYNCERPIDFILE}" ] || \ if ! [ -f "${SYNCERPIDFILE}" ] || \
[ -s "${SYNCERPIDFILE}" ] || \
! [ -d /proc/$(cat "${SYNCERPIDFILE}") ]; then ! [ -d /proc/$(cat "${SYNCERPIDFILE}") ]; then
debug "Starting sync process" debug "Starting sync process"
env_sync_proc & env_sync_proc &
@ -387,7 +387,7 @@ function teardown_env {
# starting the syncer process when this occurs by deleting the # starting the syncer process when this occurs by deleting the
# PID file. # PID file.
kill $(cat "${SYNCERPIDFILE}") && \ kill $(cat "${SYNCERPIDFILE}") && \
rm -f "${SYNCERPIDFILE}" || \ sudo rm -f "${SYNCERPIDFILE}" || \
debug "Unable to clean up syncer process."; debug "Unable to clean up syncer process.";
MOUNTED_PATH=$(readlink -f "$FLAGS_chroot") MOUNTED_PATH=$(readlink -f "$FLAGS_chroot")