commit d166aafd2813b10ba492cc4f4f7bbfaed82e92f8
author Brian Harring <ferringb@chromium.org> Mon May 14 18:31:53 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon May 14 21:19:55 2012 -0700
tree bfc7440bec53f3c6ac90a4f72ff3322f42a6b58e
parent f11bf684abffb00f928b8d9f51032cfc208d630d

Move logging out of cgroups purview.

This is done to ensure that *all* output makes it through, even during
hard cgroups shutdown.

In the process, make MasterPidContextManager work during the
critical section rollback (specifically via changing it's master
pid on the fly).

BUG=chromium-os:28631
TEST-cbuildbot x86-generic-full

Change-Id: Ibc15c048323b475d976f20015908fe0958abaf34
Reviewed-on: https://gerrit.chromium.org/gerrit/22667
Tested-by: Brian Harring <ferringb@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Brian Harring <ferringb@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 4d04a03..0b469e8 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -562,31 +562,15 @@
 
     return False
 
-  # Start tee-ing output to file.
-  log_file = None
-  if options.tee:
-    default_dir = os.path.join(options.buildroot, _DEFAULT_LOG_DIR)
-    dirname = options.log_dir or default_dir
-    log_file = os.path.join(dirname, _BUILDBOT_LOG_FILE)
+  cros_lib.Info("cbuildbot executed with args %s"
+                % ' '.join(map(repr, sys.argv)))
+  if IsDistributedBuilder():
+    buildbot = DistributedBuilder(options, build_config)
+  else:
+    buildbot = SimpleBuilder(options, build_config)
 
-    osutils.SafeMakedirs(dirname)
-    _BackupPreviousLog(log_file)
-
-  try:
-    with cros_lib.AllowDisabling(options.tee, tee.Tee, log_file):
-      cros_lib.Info("cbuildbot executed with args %s"
-                    % ' '.join(map(repr, sys.argv)))
-      options.preserve_paths = set([_DEFAULT_LOG_DIR])
-      if IsDistributedBuilder():
-        buildbot = DistributedBuilder(options, build_config)
-      else:
-        buildbot = SimpleBuilder(options, build_config)
-
-      if not buildbot.Run():
-        sys.exit(1)
-  finally:
-    if options.tee:
-      cros_lib.Info('Output should be saved to %s' % log_file)
+  if not buildbot.Run():
+    sys.exit(1)
 
 
 # Parser related functions
@@ -1116,14 +1100,29 @@
                  'rather than the root of it.  This is not supported.'
                  % options.buildroot)
 
+  log_file = None
+  if options.tee:
+    default_dir = os.path.join(options.buildroot, _DEFAULT_LOG_DIR)
+    dirname = options.log_dir or default_dir
+    log_file = os.path.join(dirname, _BUILDBOT_LOG_FILE)
+
+    osutils.SafeMakedirs(dirname)
+    _BackupPreviousLog(log_file)
+
   with cros_lib.ContextManagerStack() as stack:
     critical_section = stack.Add(cleanup.EnforcedCleanupSection)
     stack.Add(sudo.SudoKeepAlive)
+
     if not options.resume:
       # If we're in resume mode, use our parents tempdir rather than
       # nesting another layer.
       stack.Add(osutils.TempDirContextManager, 'cbuildbot-tmp')
       logging.debug("Cbuildbot tempdir is %r.", os.environ.get('TMP'))
+
+    if log_file is not None:
+      stack.Add(tee.Tee, log_file)
+      options.preserve_paths = set([_DEFAULT_LOG_DIR])
+
     if options.cgroups:
       stack.Add(cgroups.SimpleContainChildren, 'cbuildbot')
 
@@ -1132,6 +1131,7 @@
     # ensures that sudo bits cannot outlive cbuildbot, that anything
     # cgroups would kill gets killed, etc.
     critical_section.ForkWatchdog()
+
     if options.timeout > 0:
       stack.Add(cros_lib.Timeout, options.timeout)