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/ssh_connection.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/ssh_connection.py')
-rw-r--r-- | benchmarks/harness/ssh_connection.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/benchmarks/harness/ssh_connection.py b/benchmarks/harness/ssh_connection.py index a50e34293..b8c8e42d4 100644 --- a/benchmarks/harness/ssh_connection.py +++ b/benchmarks/harness/ssh_connection.py @@ -13,7 +13,7 @@ # limitations under the License. """SSHConnection handles the details of SSH connections.""" - +import logging import os import warnings @@ -24,6 +24,8 @@ from benchmarks import harness # Get rid of paramiko Cryptography Warnings. warnings.filterwarnings(action="ignore", module=".*paramiko.*") +log = logging.getLogger(__name__) + def send_one_file(client: paramiko.SSHClient, path: str, remote_dir: str) -> str: @@ -94,10 +96,13 @@ class SSHConnection: The contents of stdout and stderr. """ with self._client() as client: + log.info("running command: %s", cmd) _, stdout, stderr = client.exec_command(command=cmd) - stdout.channel.recv_exit_status() + log.info("returned status: %d", stdout.channel.recv_exit_status()) stdout = stdout.read().decode("utf-8") stderr = stderr.read().decode("utf-8") + log.info("stdout: %s", stdout) + log.info("stderr: %s", stderr) return stdout, stderr def send_workload(self, name: str) -> str: |