Performance testing code cleanup

test/performance/README.md

@@ -29,18 +29,23 @@ determines the valid keys in this ConfigMap. Current keys are:
 1.  Use `ko` to apply yaml files in the benchmark directory.
 
 ```
-ko apply -f test/performance/broker-latency
+ko apply -f test/performance/broker-imc
 ```
 
-## Plotting results
+## Available benchmarks
+
+* `direct`: Source -> Sink test for baseline
+* `broker-imc`: Source -> Broker IMC -> Sink
+
+## Plotting results from mako-stub
 
 In order to plot results from the mako-stub, you need to have installed
 `gnuplot`.
 
-First you need to collect results from the mako stub:
+First you need to collect results from logs:
 
 ```
-kubectl logs -n perf-eventing direct-latency-aggregator mako-stub -f > data.csv
+kubectl logs -n perf-eventing direct-perf-aggregator mako-stub -f > data.csv
 ```
 
 Three plot scripts are available:
@@ -54,5 +59,5 @@ combined plot script, you need to specify also latency upper bound, thpt lower
 and upper bound to show. For example:
 
 ```
-gnuplot -c test/performance/latency-and-thpt-plot.plg run-with-thpt.csv 0.005 480 520
+gnuplot -c test/performance/latency-and-thpt-plot.plg data.csv 0.005 480 520
 ```

test/performance/broker-latency/broker-latency-setup.yaml → test/performance/broker-imc/100-broker-perf-setup.yaml

@@ -34,15 +34,15 @@ spec:
 apiVersion: eventing.knative.dev/v1alpha1
 kind: Trigger
 metadata:
-  name: broker-latency
+  name: broker-perf
   namespace: perf-eventing
 spec:
   broker: in-memory-test-broker
   subscriber:
     ref:
       apiVersion: v1
       kind: Service
-      name: broker-latency-consumer
+      name: broker-perf-consumer
 
 ---
 
@@ -163,11 +163,11 @@ roleRef:
 apiVersion: v1
 kind: Service
 metadata:
-  name: broker-latency-consumer
+  name: broker-perf-consumer
   namespace: perf-eventing
 spec:
   selector:
-    role: broker-latency-consumer
+    role: broker-perf-consumer
   ports:
   - name: http
     port: 80
@@ -179,11 +179,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: broker-latency-aggregator
+  name: broker-perf-aggregator
   namespace: perf-eventing
 spec:
   selector:
-    role: broker-latency-aggregator
+    role: broker-perf-aggregator
   ports:
   - name: grpc
     port: 10000

test/performance/broker-latency/broker-latency.yaml → test/performance/broker-imc/200-broker-perf.yaml

@@ -15,29 +15,29 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: broker-latency-send-receive
+  name: broker-perf-send-receive
   namespace: perf-eventing
   labels:
-    role: broker-latency-consumer
+    role: broker-perf-consumer
 spec:
   completions: 1
   parallelism: 1
   backoffLimit: 0
   template:
     metadata:
       labels:
-        role: broker-latency-consumer
+        role: broker-perf-consumer
     spec:
       serviceAccountName: perf-eventing
       restartPolicy: Never
       containers:
       - name: sender-receiver
-        image: knative.dev/eventing/test/test_images/latencymako
+        image: knative.dev/eventing/test/test_images/performance
         args:
         - "--role=sender-receiver"
         - "--sink=http://in-memory-test-broker-broker.perf-eventing.svc.cluster.local"
-        - "--aggregator=broker-latency-aggregator:10000"
-        - "--pace=100:10,200:20,400:60"
+        - "--aggregator=broker-perf-aggregator:10000"
+        - "--pace=1000:30"
         - "--verbose"
         env:
         - name: POD_NAME
@@ -61,16 +61,16 @@ spec:
 apiVersion: v1
 kind: Pod
 metadata:
-  name: broker-latency-aggregator
+  name: broker-perf-aggregator
   namespace: perf-eventing
   labels:
-    role: broker-latency-aggregator
+    role: broker-perf-aggregator
 spec:
   serviceAccountName: perf-eventing
   restartPolicy: Never
   containers:
   - name: aggregator
-    image: knative.dev/eventing/test/test_images/latencymako
+    image: knative.dev/eventing/test/test_images/performance
     args:
     - "--role=aggregator"
       # set to the number of sender-receiver
@@ -93,6 +93,9 @@ spec:
     - name: quickstore
       containerPort: 9813
     terminationMessagePolicy: FallbackToLogsOnError
+    resources:
+      requests:
+        memory: 4Gi
   volumes:
   - name: config-mako
     configMap: