Fix bug with container_netperf which was out of sync with parsing code

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=241601309
matt-smu · Apr 2, 2019 · 431b8e8 · 431b8e8
1 parent 253b861
commit 431b8e8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/perfkitbenchmarker/container_service.py b/perfkitbenchmarker/container_service.py
@@ -361,6 +361,7 @@ def _Build(self, image):
         # Build the image remotely using an image building service.
         self.RemoteBuild(image)
         self.remote_build_times[image.name] = time.time() - build_start
+        return
       except NotImplementedError:
         pass
 

diff --git a/perfkitbenchmarker/linux_benchmarks/container_netperf_benchmark.py b/perfkitbenchmarker/linux_benchmarks/container_netperf_benchmark.py
@@ -82,18 +82,12 @@ def Run(benchmark_spec):
   cluster = benchmark_spec.container_cluster
   container_0 = cluster.containers['netperf'][0]
   spec = benchmark_spec.container_specs['netperf']
-
-  output_selector = (
-      'THROUGHPUT,THROUGHPUT_UNITS,P50_LATENCY,P90_LATENCY,P99_LATENCY,'
-      'STDDEV_LATENCY,MIN_LATENCY,MAX_LATENCY,CONFIDENCE_ITERATION,'
-      'THROUGHPUT_CONFID'
-  )
   spec.command = ['netperf',
                   '-t', 'TCP_STREAM',
                   '-H', container_0.ip_address,
                   '-l', '100',
                   '--',
-                  '-o', output_selector]
+                  '-o', netperf_benchmark.OUTPUT_SELECTOR]
   cluster.DeployContainer('netperf', benchmark_spec.container_specs['netperf'])
   container_1 = cluster.containers['netperf'][1]
   container_1.WaitForExit()

diff --git a/perfkitbenchmarker/linux_benchmarks/netperf_benchmark.py b/perfkitbenchmarker/linux_benchmarks/netperf_benchmark.py
@@ -83,6 +83,14 @@
 
 MBPS = 'Mbits/sec'
 TRANSACTIONS_PER_SECOND = 'transactions_per_second'
+# Specifies the keys and to include in the results for OMNI tests.
+# Any user of ParseNetperfOutput() (e.g. container_netperf_benchmark), must
+# specify these selectors to ensure the parsing doesn't break.
+OUTPUT_SELECTOR = (
+    'THROUGHPUT,THROUGHPUT_UNITS,P50_LATENCY,P90_LATENCY,'
+    'P99_LATENCY,STDDEV_LATENCY,MIN_LATENCY,MAX_LATENCY,'
+    'CONFIDENCE_ITERATION,THROUGHPUT_CONFID,'
+    'LOCAL_TRANSPORT_RETRANS,REMOTE_TRANSPORT_RETRANS')
 
 # Command ports are even (id*2), data ports are odd (id*2 + 1)
 PORT_START = 20000
@@ -332,15 +340,12 @@ def RunNetperf(vm, benchmark_name, server_ip, num_streams):
                  '-t {benchmark_name} -H {server_ip} -l {length} {confidence}'
                  ' -- '
                  '-P ,{{data_port}} '
-                 '-o THROUGHPUT,THROUGHPUT_UNITS,P50_LATENCY,P90_LATENCY,'
-                 'P99_LATENCY,STDDEV_LATENCY,'
-                 'MIN_LATENCY,MAX_LATENCY,'
-                 'CONFIDENCE_ITERATION,THROUGHPUT_CONFID,'
-                 'LOCAL_TRANSPORT_RETRANS,REMOTE_TRANSPORT_RETRANS').format(
+                 '-o {output_selector}').format(
                      netperf_path=netperf.NETPERF_PATH,
                      benchmark_name=benchmark_name,
                      server_ip=server_ip,
                      length=FLAGS.netperf_test_length,
+                     output_selector=OUTPUT_SELECTOR,
                      confidence=confidence, verbosity=verbosity)
   if FLAGS.netperf_thinktime != 0:
     netperf_cmd += (' -X {thinktime},{thinktime_array_size},'

diff --git a/perfkitbenchmarker/providers/gcp/google_container_engine.py b/perfkitbenchmarker/providers/gcp/google_container_engine.py
@@ -72,7 +72,7 @@ def Push(self, image):
   def RemoteBuild(self, image):
     """Build the image remotely."""
     full_tag = self.GetFullRegistryTag(image.name)
-    build_cmd = util.GcloudCommand(self, 'container', 'builds', 'submit',
+    build_cmd = util.GcloudCommand(self, 'builds', 'submit',
                                    '--tag', full_tag, image.directory)
     del build_cmd.flags['zone']
     build_cmd.Issue()