commit 0bd74dd4f9b7de0ad342d44ad59bfa1a36e15bcc
author Prathmesh Prabhu <pprabhu@chromium.org> Fri Sep 01 12:12:18 2017 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Sep 07 17:41:06 2017 +0000
tree bd25ba33054144f1cda3d115ebb777f974cb4605
parent 9121dd9a1b259cf740c9451d9373b78bfda59068

autotest: Do not create new host objects in profilers

There's no reason existing host objects from job can't be used, and the
create_host call in profilers was broken.

BUG=chromium:757604
TEST=Run telemetry_AFDOGenerate

Change-Id: I5d7a20aa82ea8318ed340414ea30e6fcf242279b
Reviewed-on: https://chromium-review.googlesource.com/648327
Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
(cherry picked from commit 8dacdb1be8c6419a5e46a90e9d820390dec72ed0)
Reviewed-on: https://chromium-review.googlesource.com/655364
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>

server/profilers.py

diff --git a/server/profilers.py b/server/profilers.py
index 97c057b..d2271be 100644
--- a/server/profilers.py
+++ b/server/profilers.py
@@ -2,7 +2,7 @@
 
 import common
 from autotest_lib.client.common_lib import utils, error, profiler_manager
-from autotest_lib.server import profiler, autotest, standalone_profiler, hosts
+from autotest_lib.server import profiler, autotest, standalone_profiler
 
 
 PROFILER_TMPDIR = '/tmp/profilers'
@@ -62,7 +62,7 @@
         """
         Install autotest on any current job hosts.
         """
-        in_use_hosts = set()
+        in_use_hosts = dict()
         # find hosts in use but not used by us
         for host in self.job.hosts:
             if host.hostname not in self.job.machines:
@@ -72,8 +72,8 @@
                 continue
             autodir = host.get_autodir()
             if not (autodir and autodir.startswith(PROFILER_TMPDIR)):
-                in_use_hosts.add(host.hostname)
-        logging.debug('Hosts currently in use: %s', in_use_hosts)
+                in_use_hosts[host.hostname] = host
+        logging.debug('Hosts currently in use: %s', set(in_use_hosts))
 
         # determine what valid host objects we already have installed
         profiler_hosts = set()
@@ -84,26 +84,21 @@
                 # the profiler was wiped out somehow, drop this install
                 logging.warning('The profiler client on %s at %s was deleted',
                                 host.hostname, profiler_dir)
-                host.close()
                 del self.installed_hosts[host.hostname]
         logging.debug('Hosts with profiler clients already installed: %s',
                       profiler_hosts)
 
         # install autotest on any new hosts in use
-        for hostname in in_use_hosts - profiler_hosts:
-            host = hosts.create_host(hostname)
+        for hostname in set(in_use_hosts) - profiler_hosts:
+            host = in_use_hosts[hostname]
             tmp_dir = host.get_tmp_dir(parent=PROFILER_TMPDIR)
             at = autotest.Autotest(host)
             at.install_no_autoserv(autodir=tmp_dir)
             self.installed_hosts[host.hostname] = (host, at, tmp_dir)
 
         # drop any installs from hosts no longer in job.hosts
-        hostnames_to_drop = profiler_hosts - in_use_hosts
-        hosts_to_drop = [self.installed_hosts[hostname][0]
-                         for hostname in hostnames_to_drop]
-        for host in hosts_to_drop:
-            host.close()
-            del self.installed_hosts[host.hostname]
+        for hostname in profiler_hosts - set(in_use_hosts):
+            del self.installed_hosts[hostname]
 
 
     def _get_hosts(self, host=None):