Add support for benchmark started time

Author: Matt Pryor

python/perftest/models/v1alpha1/base.py

@@ -127,6 +127,10 @@ class BenchmarkStatus(schema.BaseModel):
         default_factory = list,
         description = "List of references to the managed resources for this benchmark."
     )
+    started_at: t.Optional[datetime.datetime] = Field(
+        None,
+        description = "The time at which the benchmark started."
+    )
     finished_at: t.Optional[datetime.datetime] = Field(
         None,
         description = "The time at which the benchmark finished."

python/perftest/models/v1alpha1/iperf.py

@@ -40,10 +40,6 @@ class IPerfSpec(schema.BaseModel):
         None,
         description = "The resources to use for benchmark containers."
     )
-    server_service: bool = Field(
-        False,
-        description = "Indicates whether to access the server via a service or not."
-    )
     duration: schema.conint(gt = 0) = Field(
         ...,
         description = "The duration of the benchmark."
@@ -122,11 +118,6 @@ class IPerf(
             "type": "string",
             "jsonPath": ".spec.networkName",
         },
-        {
-            "name": "Server Service",
-            "type": "string",
-            "jsonPath": ".spec.serverService",
-        },
         {
             "name": "Duration",
             "type": "integer",
@@ -142,6 +133,11 @@ class IPerf(
             "type": "string",
             "jsonPath": ".status.phase",
         },
+        {
+            "name": "Started",
+            "type": "date",
+            "jsonPath": ".status.startedAt",
+        },
         {
             "name": "Finished",
             "type": "date",

python/perftest/models/v1alpha1/openfoam.py

@@ -140,6 +140,11 @@ class OpenFOAM(
             "type": "string",
             "jsonPath": ".status.phase",
         },
+        {
+            "name": "Started",
+            "type": "date",
+            "jsonPath": ".status.startedAt",
+        },
         {
             "name": "Finished",
             "type": "date",

python/perftest/models/v1alpha1/pingpong.py

@@ -123,6 +123,11 @@ class MPIPingPong(
             "type": "string",
             "jsonPath": ".status.phase",
         },
+        {
+            "name": "Started",
+            "type": "date",
+            "jsonPath": ".status.startedAt",
+        },
         {
             "name": "Finished",
             "type": "date",

python/perftest/operator.py

@@ -266,32 +266,33 @@ async def handle_benchmark_status_changed(benchmark, **kwargs):
                 succeeded = benchmark.status.phase == api.BenchmarkPhase.COMPLETED
                 benchmark_set.status.completed[benchmark.metadata.name] = succeeded
                 _ = await save_benchmark_status(benchmark_set)
-        return
-    # The only other phase we want to act on is summarising
-    if benchmark.status.phase != api.BenchmarkPhase.SUMMARISING:
-        return
-    # Allow the benchmark to summarise itself and save
-    try:
-        benchmark.summarise()
-    except errors.PodResultsIncompleteError as exc:
-        # Convert this into a temporary error with a short delay, as it is likely
-        # to be resolved quickly
-        raise kopf.TemporaryError(str(exc), delay = 1)
-    else:
-        benchmark = await save_benchmark_status(benchmark)
-    # Once the benchmark summary has been saved successfully, we can delete the managed resources
-    for ref in benchmark.status.managed_resources:
-        ekapi = EK_CLIENT.api(ref.api_version)
-        resource = await ekapi.resource(ref.kind)
-        await resource.delete(ref.name, namespace = benchmark.metadata.namespace)
-    # Make sure to delete the priority class
-    ekapi = EK_CLIENT.api("scheduling.k8s.io/v1")
-    resource = await ekapi.resource("priorityclasses")
-    _ = await resource.delete(benchmark.status.priority_class_name)
-    # Once the resources are deleted, we can mark the benchmark as completed
-    benchmark.status.phase = api.BenchmarkPhase.COMPLETED
-    benchmark.status.managed_resources = []
-    _ = await save_benchmark_status(benchmark)
+    elif benchmark.status.phase == api.BenchmarkPhase.RUNNING:
+        if not benchmark.status.started_at:
+            benchmark.status.started_at = datetime.datetime.now()
+            _ = await save_benchmark_status(benchmark)
+    elif benchmark.status.phase == api.BenchmarkPhase.SUMMARISING:
+        # Allow the benchmark to summarise itself and save
+        try:
+            benchmark.summarise()
+        except errors.PodResultsIncompleteError as exc:
+            # Convert this into a temporary error with a short delay, as it is likely
+            # to be resolved quickly
+            raise kopf.TemporaryError(str(exc), delay = 1)
+        else:
+            benchmark = await save_benchmark_status(benchmark)
+        # Once the benchmark summary has been saved successfully, we can delete the managed resources
+        for ref in benchmark.status.managed_resources:
+            ekapi = EK_CLIENT.api(ref.api_version)
+            resource = await ekapi.resource(ref.kind)
+            await resource.delete(ref.name, namespace = benchmark.metadata.namespace)
+        # Make sure to delete the priority class
+        ekapi = EK_CLIENT.api("scheduling.k8s.io/v1")
+        resource = await ekapi.resource("priorityclasses")
+        _ = await resource.delete(benchmark.status.priority_class_name)
+        # Once the resources are deleted, we can mark the benchmark as completed
+        benchmark.status.phase = api.BenchmarkPhase.COMPLETED
+        benchmark.status.managed_resources = []
+        _ = await save_benchmark_status(benchmark)
 
 
 @benchmark_handler(kopf.on.delete)
@@ -349,6 +350,8 @@ async def handle_job_event(benchmark, body, **kwargs):
     """
     Executes whenever an event occurs for a Volcano job that is part of a benchmark.
     """
+    if type == "DELETED":
+        return
     # If the benchmark is completed, there is nothing to do
     if benchmark.status.phase == api.BenchmarkPhase.COMPLETED:
         return
@@ -422,7 +425,7 @@ async def handle_endpoints_event(type, benchmark, body, name, namespace, **kwarg
             },
             "data": {
                 "hosts": hosts,
-            }
+            },
         },
         namespace = configmap.metadata.namespace
     )

python/perftest/templates/iperf.yaml.j2

@@ -1,25 +1,3 @@
-{%- if benchmark.spec.server_service %}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ benchmark.metadata.name }}-server
-  labels:
-    {{ settings.kind_label }}: {{ benchmark.kind }}
-    {{ settings.namespace_label }}: {{ benchmark.metadata.namespace }}
-    {{ settings.name_label }}: {{ benchmark.metadata.name }}
-    {{ settings.component_label }}: server
-spec:
-  ports:
-    - port: 5001
-      targetPort: iperf-server
-      protocol: TCP
-  selector:
-    {{ settings.kind_label }}: {{ benchmark.kind }}
-    {{ settings.namespace_label }}: {{ benchmark.metadata.namespace }}
-    {{ settings.name_label }}: {{ benchmark.metadata.name }}
-    {{ settings.component_label }}: server
-{%- endif %}
 ---
 apiVersion: v1
 kind: Service
@@ -151,11 +129,7 @@ spec:
               imagePullPolicy: {{ benchmark.spec.image_pull_policy }}
               args:
                 - --client
-                {%- if benchmark.spec.server_service %}
-                - "{{ benchmark.metadata.name }}-server"
-                {%- else %}
                 - "{{ benchmark.metadata.name }}-server-0.{{ benchmark.metadata.name }}"
-                {%- endif %}
                 - --time
                 - "{{ benchmark.spec.duration }}"
                 - --parallel