diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml index dda3a12228f20869999e8cc0b8bf67f41f380c37..6b21aa2ab11c10be93f4113ad19fc7212032880f 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml @@ -12,6 +12,7 @@ spec: - configMap: name: "benchmark-resources-uc1-beam-flink" files: + - "flink-configuration-configmap.yaml" - "taskmanager-deployment.yaml" - "taskmanager-service.yaml" - "service-monitor.yaml" @@ -35,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml index 8a4bbd90e220ac759f2374db2070f3b507aa4ca5..428f9928f8441d8dd81c15b1fcd5bc3032f7ad80 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml @@ -37,6 +37,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc1-beam-samza-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc1-beam-samza-deployment.yaml + properties: + container: uc1-beam-samza + variableName: SAMZA_JOB_CONTAINER_THREADS_POOL_SIZE + - type: ResourceLimitPatcher + resource: uc1-beam-samza-deployment.yaml + properties: + container: uc1-beam-samza + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc1-beam-samza-deployment.yaml + properties: + container: uc1-beam-samza + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml index 2dd1bde1b18516734d7d50453f399e692265d53b..ddd0d388aa33d36caa6ffb29c384346f379b2530 100644 --- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml @@ -36,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml index 6e89af1c4cbbaaef5c3e4e9cd72b0443955793e2..b3933ff355f2320da4bcf632cb41cacb18aa70c4 100644 --- a/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-hazelcastjet-benchmark-operator.yaml @@ -28,6 +28,22 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc1-hazelcastjet-deployment.yaml" + - typeName: PodResources + patchers: + - type: ResourceLimitPatcher + resource: uc1-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc1-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml index 0b3f36cfe4b15ec7057830072aa8cc06743a6397..530fed41ebe59b43c7f1edc91cb243f6f2fbe921 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml @@ -28,6 +28,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc1-kstreams-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc1-kstreams-deployment.yaml + properties: + container: uc-application + variableName: NUM_STREAM_THREADS + - type: ResourceLimitPatcher + resource: uc1-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc1-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml index 5c0337dfd0bcb6fd672a6b93c42c52bb989b2677..7dc7a2c58cad47efe2dac623a0834648974ea988 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml @@ -12,6 +12,7 @@ spec: - configMap: name: "benchmark-resources-uc2-beam-flink" files: + - "flink-configuration-configmap.yaml" - "taskmanager-deployment.yaml" - "taskmanager-service.yaml" - "service-monitor.yaml" @@ -35,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml index b341f36eb4e247de80a8aab6b993e6dc1c3bcb16..20abcca66c2efb4fedc5e092f464622b27d5ca18 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml @@ -37,6 +37,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc2-beam-samza-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc2-beam-samza-deployment.yaml + properties: + container: uc2-beam-samza + variableName: SAMZA_JOB_CONTAINER_THREADS_POOL_SIZE + - type: ResourceLimitPatcher + resource: uc2-beam-samza-deployment.yaml + properties: + container: uc2-beam-samza + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc2-beam-samza-deployment.yaml + properties: + container: uc2-beam-samza + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml index d0a71fb73b5b9fd533426eb826fd0f83d1c9dae7..b3904ca5f6ecff70ec0d03f77800449784525cb9 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml @@ -36,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml index 2e005033349145bb8fc2494fb52eea39d73ecbb8..101a0e840253654b2c6c0e772ced938ee6c98b7d 100644 --- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml @@ -28,6 +28,22 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc2-hazelcastjet-deployment.yaml" + - typeName: PodResources + patchers: + - type: ResourceLimitPatcher + resource: uc2-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc2-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml index 35d55b6079ee3ffd4eafef100dc48fd4dcb7f116..82f2f8bb8214ea4ae81954ee6af24b0c0b1cded1 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml @@ -28,6 +28,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc2-kstreams-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc2-kstreams-deployment.yaml + properties: + container: uc-application + variableName: NUM_STREAM_THREADS + - type: ResourceLimitPatcher + resource: uc2-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc2-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml index d923bd993fac32b7c2db2aa75715fbdd5e948f15..0610ed0c9d7d72b9943618116380b9d37a5acea4 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml @@ -12,6 +12,7 @@ spec: - configMap: name: "benchmark-resources-uc3-beam-flink" files: + - "flink-configuration-configmap.yaml" - "taskmanager-deployment.yaml" - "taskmanager-service.yaml" - "service-monitor.yaml" @@ -35,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml index a4c8d8a8116f2b674f03fb3f02b9f95492697db2..b61b82b59d1ef61e61ffbdbe7e79c277139f63a1 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml @@ -37,6 +37,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc3-beam-samza-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc3-beam-samza-deployment.yaml + properties: + container: uc3-beam-samza + variableName: SAMZA_JOB_CONTAINER_THREADS_POOL_SIZE + - type: ResourceLimitPatcher + resource: uc3-beam-samza-deployment.yaml + properties: + container: uc3-beam-samza + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc3-beam-samza-deployment.yaml + properties: + container: uc3-beam-samza + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml index 41f2129ebd8afb8370ae6bfb8291fcc498d851fd..e77316ca8fc85197c63ccc9ce1f1d6da53decf3e 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml @@ -36,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml index c5c3b34ccaa4515d871c1c25978179669865d25b..9855cefbbdc72b7d021e76ece6045209627581d4 100644 --- a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-hazelcastjet-benchmark-operator.yaml @@ -28,6 +28,22 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc3-hazelcastjet-deployment.yaml" + - typeName: PodResources + patchers: + - type: ResourceLimitPatcher + resource: uc3-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc3-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml index 15b21d74f58a1d5e6841de372ac5744060200c73..62051755085cd5dd6870f670d2c12cf81fd29639 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml @@ -28,6 +28,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc3-kstreams-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc3-kstreams-deployment.yaml + properties: + container: uc-application + variableName: NUM_STREAM_THREADS + - type: ResourceLimitPatcher + resource: uc3-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc3-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumSensors" patchers: diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml index 34670bdca234e24d37382c43b585169b550f99a3..2ef59bd15b08d8d480a1802059aef0402d3e535c 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml @@ -12,6 +12,7 @@ spec: - configMap: name: "benchmark-resources-uc4-beam-flink" files: + - "flink-configuration-configmap.yaml" - "taskmanager-deployment.yaml" - "taskmanager-service.yaml" - "service-monitor.yaml" @@ -35,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumNestedGroups" patchers: diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml index 419cfc18ff03e45da844cdfb5d8a35f0cf70b616..0dd7d9022870acbcd55aa27e049cd40afbc896c4 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml @@ -37,6 +37,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc4-beam-samza-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc4-beam-samza-deployment.yaml + properties: + container: uc4-beam-samza + variableName: SAMZA_JOB_CONTAINER_THREADS_POOL_SIZE + - type: ResourceLimitPatcher + resource: uc4-beam-samza-deployment.yaml + properties: + container: uc4-beam-samza + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc4-beam-samza-deployment.yaml + properties: + container: uc4-beam-samza + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumNestedGroups" patchers: diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml index 625d8eb9aeebf5bb55f079ebe290460191965cec..2be5d49c1b588e4339d3ac19b0598a7b9a98db27 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml @@ -7,6 +7,7 @@ metadata: data: flink-conf.yaml: |+ jobmanager.rpc.address: flink-jobmanager + taskmanager.numberOfTaskSlots: 1 blob.server.port: 6124 jobmanager.rpc.port: 6123 taskmanager.rpc.port: 6122 diff --git a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml index 951f4f0b5af5d1532eb6cb366f8d06bf8868156a..fec201f77c5a5b6daf8410dcb3ebe9c22f3facbe 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml @@ -36,6 +36,39 @@ spec: properties: container: "jobmanager" variableName: "PARALLELISM" + - typeName: TaskSlotsAndPodResources + patchers: + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.numberOfTaskSlots + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: taskmanager-deployment.yaml + properties: + container: taskmanager + limitedResource: memory + factor: 4 + format: Gi + - type: ConfigMapYamlPatcher + resource: flink-configuration-configmap.yaml + properties: + fileName: flink-conf.yaml + variableName: taskmanager.memory.process.size + factor: 4 + suffix: Gb + - type: "EnvVarPatcher" + resource: "jobmanager-deployment.yaml" + properties: + container: "jobmanager" + variableName: "PARALLELISM" loadTypes: - typeName: "NumNestedGroups" patchers: diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml index 1a6a3b3dc6b9825da8cb139825d85bbff635f15b..9db8017dffd7cddd257fa99f54ef7a464673c584 100644 --- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml @@ -28,6 +28,22 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc4-hazelcastjet-deployment.yaml" + - typeName: PodResources + patchers: + - type: ResourceLimitPatcher + resource: uc4-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc4-hazelcastjet-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumNestedGroups" patchers: diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml index f6de5f34dbff99f2ac5a9501fb296af0750bdde0..15a388f1af91e83f468b05e6cd1d61a8823e62c6 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml @@ -28,6 +28,27 @@ spec: patchers: - type: "ReplicaPatcher" resource: "uc4-kstreams-deployment.yaml" + - typeName: ThreadsAndPodResources + patchers: + - type: EnvVarPatcher + resource: uc4-kstreams-deployment.yaml + properties: + container: uc-application + variableName: NUM_STREAM_THREADS + - type: ResourceLimitPatcher + resource: uc4-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: cpu + factor: 1000 + format: m + - type: ResourceLimitPatcher + resource: uc4-kstreams-deployment.yaml + properties: + container: uc-application + limitedResource: memory + factor: 4 + format: Gi loadTypes: - typeName: "NumNestedGroups" patchers: