diff options
author | Zach Koopmans <zkoopmans@google.com> | 2019-12-11 15:38:07 -0800 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-12-11 15:51:41 -0800 |
commit | e2e3b38460096a00cabe9041177e729c54e07b3b (patch) | |
tree | b42a9939e51f017a205cb1f6ac8a4d93c5c081c4 /benchmarks/harness/machine.py | |
parent | e690651c67d38c2bd8532ddabd2967ebeef58c7e (diff) |
GCloudProducer: tunnel_dispatch, mock_recorder, and machine.
Work to import GCloudProducer, written in gerrit, which is
too large to do in one CL. GCloudProducer sets up gcloud
instances to run benchmark workloads.
Included are:
- gcloud_mock_recorder - used to Mock GCloudProducer
- tunnel_dispatcher - updates to this module to bring it in line
with the style guide
- machine - updates to this module to bring it in line with the
style guide
All changes are independent of the rest of the changes, and
should "just build".
PiperOrigin-RevId: 285076423
Diffstat (limited to 'benchmarks/harness/machine.py')
-rw-r--r-- | benchmarks/harness/machine.py | 55 |
1 files changed, 44 insertions, 11 deletions
diff --git a/benchmarks/harness/machine.py b/benchmarks/harness/machine.py index 2166d040a..66b719b63 100644 --- a/benchmarks/harness/machine.py +++ b/benchmarks/harness/machine.py @@ -11,7 +11,22 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -"""Machine abstraction. This is the primary API for benchmarks.""" +"""Machine abstraction passed to benchmarks to run docker containers. + +Abstraction for interacting with test machines. Machines are produced +by Machine producers and represent a local or remote machine. Benchmark +methods in /benchmarks/suite are passed the required number of machines in order +to run the benchmark. Machines contain methods to run commands via bash, +possibly over ssh. Machines also hold a connection to the docker UNIX socket +to run contianers. + + Typical usage example: + + machine = Machine() + machine.run(cmd) + machine.pull(path) + container = machine.container() +""" import logging import re @@ -28,12 +43,16 @@ from benchmarks.harness import ssh_connection from benchmarks.harness import tunnel_dispatcher -class Machine: +class Machine(object): """The machine object is the primary object for benchmarks. Machine objects are passed to each metric function call and benchmarks use machines to access real connections to those machines. + + Attributes: + _name: Name as a string """ + _name = "" def run(self, cmd: str) -> Tuple[str, str]: """Convenience method for running a bash command on a machine object. @@ -90,11 +109,15 @@ class Machine: def sleep(self, amount: float): """Sleeps the given amount of time.""" - raise NotImplementedError + time.sleep(amount) + + def __str__(self): + return self._name class MockMachine(Machine): """A mocked machine.""" + _name = "mock" def run(self, cmd: str) -> Tuple[str, str]: return "", "" @@ -119,15 +142,18 @@ def get_address(machine: Machine) -> str: class LocalMachine(Machine): - """The local machine.""" + """The local machine. + + Attributes: + _name: Name as a string + _docker_client: a pythonic connection to to the local dockerd unix socket. + See: https://github.com/docker/docker-py + """ def __init__(self, name): self._name = name self._docker_client = docker.from_env() - def __str__(self): - return self._name - def run(self, cmd: str) -> Tuple[str, str]: process = subprocess.Popen( cmd.split(" "), stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -155,7 +181,17 @@ class LocalMachine(Machine): class RemoteMachine(Machine): - """Remote machine accessible via an SSH connection.""" + """Remote machine accessible via an SSH connection. + + Attributes: + _name: Name as a string + _ssh_connection: a paramiko backed ssh connection which can be used to run + commands on this machine + _tunnel: a python wrapper around a port forwarded ssh connection between a + local unix socket and the remote machine's dockerd unix socket. + _docker_client: a pythonic wrapper backed by the _tunnel. Allows sending + docker commands: see https://github.com/docker/docker-py + """ def __init__(self, name, **kwargs): self._name = name @@ -164,9 +200,6 @@ class RemoteMachine(Machine): self._tunnel.connect() self._docker_client = self._tunnel.get_docker_client() - def __str__(self): - return self._name - def run(self, cmd: str) -> Tuple[str, str]: return self._ssh_connection.run(cmd) |