From 43729730f36a6a228d8cddad09911113a2db5d9a Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Thu, 17 Jun 2021 12:15:51 +0200
Subject: [PATCH] small restructuring, update example files
---
.../example-execution-yaml-resource.yaml | 49 ---------------
.../examples/operator/example-benchmark.yaml | 6 +-
.../examples/operator/example-execution.yaml | 62 ++++++++++++-------
.../standalone/example-benchmark.yaml | 9 ++-
.../standalone/example-execution.yaml | 3 +-
5 files changed, 51 insertions(+), 78 deletions(-)
delete mode 100644 theodolite-quarkus/config/example-execution-yaml-resource.yaml
diff --git a/theodolite-quarkus/config/example-execution-yaml-resource.yaml b/theodolite-quarkus/config/example-execution-yaml-resource.yaml
deleted file mode 100644
index e0b327a02..000000000
--- a/theodolite-quarkus/config/example-execution-yaml-resource.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: example-execution
-benchmark: "uc1-kstreams"
-load:
- loadType: "NumSensors"
- loadValues: [25000, 50000, 75000, 100000, 125000, 150000]
-resources:
- resourceType: "Instances"
- resourceValues: [1, 2, 3, 4, 5]
-slos:
- - sloType: "lag trend"
- threshold: 2000
- prometheusUrl: "http://prometheus-operated:9090"
- externalSloUrl: "http://localhost:80/evaluate-slope"
- offset: 0
- warmup: 60 # in seconds
-execution:
- strategy: "LinearSearch"
- duration: 300 # in seconds
- repetitions: 1
- loadGenerationDelay: 30 # in seconds, optional field, default is 0 seconds
- restrictions:
- - "LowerBound"
-configOverrides: []
-# - patcher:
-# type: "NodeSelectorPatcher"
-# resource: "uc1-load-generator-deployment.yaml"
-# variableName: "env"
-# value: "prod"
-# - patcher:
-# type: "NodeSelectorPatcher"
-# resource: "uc1-kstreams-deployment.yaml"
-# variableName: "env"
-# value: "prod"
-# - patcher:
-# type: "ResourceLimitPatcher"
-# resource: "uc1-kstreams-deployment.yaml"
-# container: "uc-application"
-# variableName: "cpu"
-# value: "1000m"
-# - patcher:
-# type: "ResourceLimitPatcher"
-# resource: "uc1-kstreams-deployment.yaml"
-# container: "uc-application"
-# variableName: "memory"
-# value: "2Gi"
-# - patcher:
-# type: "SchedulerNamePatcher"
-# resource: "uc1-kstreams-deployment.yaml"
-# value: "random-scheduler"
diff --git a/theodolite-quarkus/examples/operator/example-benchmark.yaml b/theodolite-quarkus/examples/operator/example-benchmark.yaml
index 829194f11..91d9f8f1f 100644
--- a/theodolite-quarkus/examples/operator/example-benchmark.yaml
+++ b/theodolite-quarkus/examples/operator/example-benchmark.yaml
@@ -22,10 +22,12 @@ spec:
- type: "EnvVarPatcher"
resource: "uc1-load-generator-deployment.yaml"
properties:
- container: "workload-generator"
variableName: "NUM_SENSORS"
+ container: "workload-generator"
- type: "NumSensorsLoadGeneratorReplicaPatcher"
resource: "uc1-load-generator-deployment.yaml"
+ properties:
+ loadGenMaxRecords: "15000"
kafkaConfig:
bootstrapServer: "theodolite-cp-kafka:9092"
topics:
@@ -33,4 +35,4 @@ spec:
numPartitions: 40
replicationFactor: 1
- name: "theodolite-.*"
- removeOnly: True
+ removeOnly: True
\ No newline at end of file
diff --git a/theodolite-quarkus/examples/operator/example-execution.yaml b/theodolite-quarkus/examples/operator/example-execution.yaml
index 4227020e7..5386fd7c8 100644
--- a/theodolite-quarkus/examples/operator/example-execution.yaml
+++ b/theodolite-quarkus/examples/operator/example-execution.yaml
@@ -2,40 +2,56 @@ apiVersion: theodolite.com/v1
kind: execution
metadata:
name: theodolite-example-execution
-spec:
- benchmark: uc1-kstreams
- load:
+spec:
+ benchmark: "uc1-kstreams"
+ load:
loadType: "NumSensors"
- loadValues:
- - 50000
+ loadValues: [25000, 50000, 75000, 100000, 125000, 150000]
resources:
resourceType: "Instances"
- resourceValues:
- - 1
+ resourceValues: [1, 2, 3, 4, 5]
slos:
- sloType: "lag trend"
- threshold: 1000
- prometheusUrl: "http://localhost:32656"
+ threshold: 2000
+ prometheusUrl: "http://prometheus-operated:9090"
externalSloUrl: "http://localhost:80/evaluate-slope"
offset: 0
- warmup: 0
+ warmup: 60 # in seconds
execution:
strategy: "LinearSearch"
- duration: 60
+ duration: 300 # in seconds
repetitions: 1
loadGenerationDelay: 30 # in seconds
restrictions:
- "LowerBound"
configOverrides:
- - patcher:
- type: "NodeSelectorPatcher"
- resource: "uc1-load-generator-deployment.yaml"
- container: ""
- variableName: "env"
- value: "prod"
- - patcher:
- type: "NodeSelectorPatcher"
- resource: "uc1-kstreams-deployment.yaml"
- container: ""
- variableName: "env"
- value: "prod"
+ # - patcher:
+ # type: "NodeSelectorPatcher"
+ # resource: "uc1-load-generator-deployment.yaml"
+ # properties:
+ # variableName: "env"
+ # value: "prod"
+ # - patcher:
+ # type: "NodeSelectorPatcher"
+ # resource: "uc1-kstreams-deployment.yaml"
+ # properties:
+ # variableName: "env"
+ # value: "prod"
+ # - patcher:
+ # type: "ResourceLimitPatcher"
+ # resource: "uc1-kstreams-deployment.yaml"
+ # properties:
+ # container: "uc-application"
+ # limitedResource: "cpu"
+ # value: "1000m"
+ # - patcher:
+ # type: "ResourceLimitPatcher"
+ # resource: "uc1-kstreams-deployment.yaml"
+ # properties:
+ # container: "uc-application"
+ # limitedResource: "memory"
+ # value: "2Gi"
+ # - patcher:
+ # type: "SchedulerNamePatcher"
+ # resource: "uc1-kstreams-deployment.yaml"
+ # value: "random-scheduler"
diff --git a/theodolite-quarkus/examples/standalone/example-benchmark.yaml b/theodolite-quarkus/examples/standalone/example-benchmark.yaml
index cdc2122d9..83edce938 100644
--- a/theodolite-quarkus/examples/standalone/example-benchmark.yaml
+++ b/theodolite-quarkus/examples/standalone/example-benchmark.yaml
@@ -17,10 +17,13 @@ loadTypes:
patchers:
- type: "EnvVarPatcher"
resource: "uc1-load-generator-deployment.yaml"
- container: "workload-generator"
- variableName: "NUM_SENSORS"
+ properties:
+ variableName: "NUM_SENSORS"
+ container: "workload-generator"
- type: "NumSensorsLoadGeneratorReplicaPatcher"
resource: "uc1-load-generator-deployment.yaml"
+ properties:
+ loadGenMaxRecords: "15000"
kafkaConfig:
bootstrapServer: "localhost:31290"
topics:
@@ -28,4 +31,4 @@ kafkaConfig:
numPartitions: 40
replicationFactor: 1
- name: "theodolite-.*"
- removeOnly: True
\ No newline at end of file
+ removeOnly: True
diff --git a/theodolite-quarkus/examples/standalone/example-execution.yaml b/theodolite-quarkus/examples/standalone/example-execution.yaml
index f49721041..24b2b7f32 100644
--- a/theodolite-quarkus/examples/standalone/example-execution.yaml
+++ b/theodolite-quarkus/examples/standalone/example-execution.yaml
@@ -17,6 +17,7 @@ execution:
strategy: "LinearSearch"
duration: 300 # in seconds
repetitions: 1
+ loadGenerationDelay: 30 # in seconds, optional field, default is 0 seconds
restrictions:
- "LowerBound"
-configOverrides: []
+configOverrides: []
\ No newline at end of file
--
GitLab