diff options
| author | Zach Koopmans <zkoopmans@google.com> | 2020-02-21 13:17:44 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2020-02-21 13:18:51 -0800 |
| commit | 3733499952c056cc8496beb01c72dcf53177048e (patch) | |
| tree | 3fa6f3cab2858c473e80b77846a5c878b84cd100 /benchmarks/harness/machine.py | |
| parent | a155a23480abfafe096ff50f2c4aaf2c215b6c44 (diff) | |
Fix master installer.
Sometimes, when we start a new instance, the file
lock on "apt" is locked. Add a loop to the master
installer.
In addition, the "apt-get install" fails to register
runsc in docker, so run the appropriate scripts to
get that to happen.
Also, add some helpful log messages.
PiperOrigin-RevId: 296497357
Diffstat (limited to 'benchmarks/harness/machine.py')
| -rw-r--r-- | benchmarks/harness/machine.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/benchmarks/harness/machine.py b/benchmarks/harness/machine.py index 3d32d3dda..5bdc4aa85 100644 --- a/benchmarks/harness/machine.py +++ b/benchmarks/harness/machine.py @@ -43,6 +43,8 @@ from benchmarks.harness import machine_mocks from benchmarks.harness import ssh_connection from benchmarks.harness import tunnel_dispatcher +log = logging.getLogger(__name__) + class Machine(object): """The machine object is the primary object for benchmarks. @@ -236,9 +238,10 @@ class RemoteMachine(Machine): archive=archive, dir=harness.REMOTE_INSTALLERS_PATH)) self._has_installers = True - # Execute the remote installer. - self.run("sudo {dir}/{file}".format( - dir=harness.REMOTE_INSTALLERS_PATH, file=installer)) + # Execute the remote installer. + self.run("sudo {dir}/{file}".format( + dir=harness.REMOTE_INSTALLERS_PATH, file=installer)) + if results: results[index] = True |