Reland r210268: "Improve forwarder2 setup/tear down in telemetry."

build/android/bb_run_sharded_steps.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.
 
 """Helper script to shard build bot steps and save results to disk.
 
 Our buildbot infrastructure requires each slave to run steps serially.
 This is sub-optimal for android, where these steps can run independently on
@@ skipping 40 matching lines @@
 import pexpect
 import pickle
 import os
 import signal
 import shutil
 import sys
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
+from pylib import forwarder
 from pylib import ports
 
 
 _OUTPUT_DIR = os.path.join(constants.DIR_SOURCE_ROOT, 'out', 'step_results')
 
 
 def _SaveResult(result):
   with file(os.path.join(_OUTPUT_DIR, result['name']), 'w') as f:
     f.write(pickle.dumps(result))
 
@@ skipping 86 matching lines @@
   with file(steps, 'r') as f:
     steps = json.load(f)
   ret = 0
   for step_name in steps.keys():
     ret |= _PrintStepOutput(step_name)
   return ret
 
 
 def _KillPendingServers():
   for retry in range(5):
+    forwarder.Forwarder.KillHost()
     for server in ['lighttpd', 'web-page-replay']:
       pids = cmd_helper.GetCmdOutput(['pgrep', '-f', server])
       pids = [pid.strip() for pid in pids.split('\n') if pid.strip()]
       for pid in pids:
         try:
           logging.warning('Killing %s %s', server, pid)
           os.kill(int(pid), signal.SIGQUIT)
         except Exception as e:
           logging.warning('Failed killing %s %s %s', server, pid, e)
 
@@ skipping 37 matching lines @@
     steps = json.load(f)
   flaky_steps = []
   if options.flaky_steps:
     with file(options.flaky_steps, 'r') as f:
       flaky_steps = json.load(f)
   return _RunShardedSteps(steps, flaky_steps, devices)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))