Revert of Unified the code to upload goma-related information.

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 54 matching lines @@
       fh = sys.stdout
     fh.write('Environment variables modified in compile.py:\n')
     for k in sorted(list(self.overrides)):
       if k in self:
         fh.write('  %s=%s\n' % (k, self[k]))
       else:
         fh.write('  %s (removed)\n' % k)
     fh.write('\n')
 
 
-def StopGomaClientAndUploadInfo(options, env, exit_status):
-  """Stop goma compiler_proxy and upload goma-related information.
-
-  Args:
-    options (Option) : options to specify where to store goma-related info.
-    env (dict)       : used when goma_ctl command executes.
-    exit_status (int): exit_status sent to monitoring system.
-  """
-  goma_ctl_cmd = [sys.executable,
-                  os.path.join(options.goma_dir, 'goma_ctl.py')]
-
-  if options.goma_jsonstatus:
-    chromium_utils.RunCommand(
-        goma_ctl_cmd + ['jsonstatus', options.goma_jsonstatus], env=env)
-    goma_utils.SendGomaTsMon(options.goma_jsonstatus, exit_status)
-
-  # If goma compiler_proxy crashes, there could be crash dump.
-  if options.build_data_dir:
-    env['GOMACTL_CRASH_REPORT_ID_FILE'] = os.path.join(options.build_data_dir,
-                                                       'crash_report_id_file')
-  # We must stop the proxy to dump GomaStats.
-  chromium_utils.RunCommand(goma_ctl_cmd + ['stop'], env=env)
-  override_gsutil = None
-  if options.gsutil_py_path:
-    override_gsutil = options.gsutil_py_path
-  goma_utils.UploadGomaCompilerProxyInfo(override_gsutil=override_gsutil)
-
-  # Upload GomaStats to make it monitored.
-  if env.get('GOMA_DUMP_STATS_FILE'):
-    goma_utils.SendGomaStats(env['GOMA_DUMP_STATS_FILE'],
-                             env.get('GOMACTL_CRASH_REPORT_ID_FILE'),
-                             options.build_data_dir)
-
 # TODO(tikuta): move to goma_utils.py
 def goma_setup(options, env):
   """Sets up goma if necessary.
 
   If using the Goma compiler, first call goma_ctl to ensure the proxy is
   available, and returns (True, instance of cloudtail subprocess).
   If it failed to start up compiler_proxy, modify options.compiler
   and options.goma_dir, modify env to GOMA_DISABLED=true,
   and returns (False, None).
   """
@@ skipping 62 matching lines @@
       cloudtail_path = 'C:\\infra-tools\\cloudtail'
     try:
       cloudtail_proc = subprocess.Popen(
           [cloudtail_path, 'tail', '--log-id', 'goma_compiler_proxy', '--path',
            goma_utils.GetLatestGomaCompilerProxyInfo()])
     except Exception as e:
       print 'failed to invoke cloudtail: %s' % e
       return True, None
     return True, cloudtail_proc
 
-  StopGomaClientAndUploadInfo(options, env, -1)
+  if options.goma_jsonstatus:
+    chromium_utils.RunCommand(
+        goma_ctl_cmd + ['jsonstatus', options.goma_jsonstatus], env=env)
+    goma_utils.SendGomaTsMon(options.goma_jsonstatus, -1)
+
+  # Try to stop compiler_proxy so that it flushes logs and stores
+  # GomaStats.
+  if options.build_data_dir:
+    env['GOMACTL_CRASH_REPORT_ID_FILE'] = os.path.join(options.build_data_dir,
+                                                       'crash_report_id_file')
+  chromium_utils.RunCommand(goma_ctl_cmd + ['stop'], env=env)
+
+  override_gsutil = None
+  if options.gsutil_py_path:
+    override_gsutil = [sys.executable, options.gsutil_py_path]
+
+  # Upload compiler_proxy.INFO to investigate the reason of compiler_proxy
+  # start-up failure.
+  goma_utils.UploadGomaCompilerProxyInfo(override_gsutil=override_gsutil)
+  # Upload GomaStats to make it monitored.
+  if env.get('GOMA_DUMP_STATS_FILE'):
+    goma_utils.SendGomaStats(env['GOMA_DUMP_STATS_FILE'],
+                             env.get('GOMACTL_CRASH_REPORT_ID_FILE'),
+                             options.build_data_dir)
 
   if options.goma_disable_local_fallback:
     print 'error: failed to start goma; fallback has been disabled'
     raise Exception('failed to start goma')
 
   print 'warning: failed to start goma. falling back to non-goma'
   # Drop goma from options.compiler
   options.compiler = options.compiler.replace('goma-', '')
   if options.compiler == 'goma':
     options.compiler = None
   # Reset options.goma_dir.
   options.goma_dir = None
   env['GOMA_DISABLED'] = '1'
   return False, None
 
 
 # TODO(tikuta): move to goma_utils.py
 def goma_teardown(options, env, exit_status, cloudtail_proc):
   """Tears down goma if necessary. """
   if options.goma_dir:
-    StopGomaClientAndUploadInfo(options, env, exit_status)
+    override_gsutil = None
+    if options.gsutil_py_path:
+      override_gsutil = [sys.executable, options.gsutil_py_path]
 
+    # If goma compiler_proxy crashes during the build, there could be crash
+    # dump.
+    if options.build_data_dir:
+      env['GOMACTL_CRASH_REPORT_ID_FILE'] = os.path.join(options.build_data_dir,
+                                                         'crash_report_id_file')
+    goma_ctl_cmd = [sys.executable,
+                    os.path.join(options.goma_dir, 'goma_ctl.py')]
+    if options.goma_jsonstatus:
+      chromium_utils.RunCommand(
+          goma_ctl_cmd + ['jsonstatus', options.goma_jsonstatus], env=env)
+      goma_utils.SendGomaTsMon(options.goma_jsonstatus, exit_status)
+    # Always stop the proxy to dump GomaStats.
+    chromium_utils.RunCommand(goma_ctl_cmd + ['stop'], env=env)
+    goma_utils.UploadGomaCompilerProxyInfo(override_gsutil=override_gsutil)
+    if env.get('GOMA_DUMP_STATS_FILE'):
+      goma_utils.SendGomaStats(env['GOMA_DUMP_STATS_FILE'],
+                               env.get('GOMACTL_CRASH_REPORT_ID_FILE'),
+                               options.build_data_dir)
   if cloudtail_proc:
     cloudtail_proc.terminate()
     cloudtail_proc.wait()
 
 
 def maybe_set_official_build_envvars(options, env):
   if options.mode == 'google_chrome' or options.mode == 'official':
     env['CHROMIUM_BUILD'] = '_google_chrome'
 
   if options.mode == 'official':
@@ skipping 308 matching lines @@
   exit_status = main_ninja(options, args, env)
 
   # stop goma
   goma_teardown(options, env, exit_status, goma_cloudtail)
 
   return exit_status
 
 
 if '__main__' == __name__:
   sys.exit(real_main())