Skip to content
Snippets Groups Projects
Commit 3b76395b authored by Sören Henning's avatar Sören Henning
Browse files

Merge branch 'main' into add-uc4-kstreams-topology-test

parents 08f14834 0d4c35c3
No related branches found
No related tags found
1 merge request!309Add UC4 K'Streams topology test
Pipeline #10251 passed
Showing
with 15 additions and 9 deletions
...@@ -26,6 +26,7 @@ Theodolite's internal development including issue boards, merge requests and ext ...@@ -26,6 +26,7 @@ Theodolite's internal development including issue boards, merge requests and ext
* [Lorenz Boguhn](https://github.com/lorenzboguhn) * [Lorenz Boguhn](https://github.com/lorenzboguhn)
* [Simon Ehrenstein](https://github.com/sehrenstein) * [Simon Ehrenstein](https://github.com/sehrenstein)
* [Willi Hasselbring](https://www.se.informatik.uni-kiel.de/en/team/prof.-dr.-wilhelm-willi-hasselbring) * [Willi Hasselbring](https://www.se.informatik.uni-kiel.de/en/team/prof.-dr.-wilhelm-willi-hasselbring)
* [Luca Mertens](https://www.linkedin.com/in/luca-mertens-35a932201)
* [Tobias Pfandzelter](https://pfandzelter.com/) * [Tobias Pfandzelter](https://pfandzelter.com/)
* [Julia Rossow](https://www.linkedin.com/in/julia-rossow/) * [Julia Rossow](https://www.linkedin.com/in/julia-rossow/)
* [Björn Vonheiden](https://github.com/bvonheid) * [Björn Vonheiden](https://github.com/bvonheid)
......
...@@ -44,7 +44,7 @@ spec: ...@@ -44,7 +44,7 @@ spec:
prometheusUrl: "http://prometheus-operated:9090" prometheusUrl: "http://prometheus-operated:9090"
offset: 0 offset: 0
properties: properties:
consumerGroup: uc1-hazelcastjet consumerGroup: theodolite-uc1-application
threshold: 2000 threshold: 2000
externalSloUrl: "http://localhost:80/evaluate-slope" externalSloUrl: "http://localhost:80/evaluate-slope"
warmup: 60 # in seconds warmup: 60 # in seconds
......
...@@ -44,7 +44,7 @@ spec: ...@@ -44,7 +44,7 @@ spec:
prometheusUrl: "http://prometheus-operated:9090" prometheusUrl: "http://prometheus-operated:9090"
offset: 0 offset: 0
properties: properties:
consumerGroup: uc2-hazelcastjet consumerGroup: theodolite-uc2-application
threshold: 2000 threshold: 2000
externalSloUrl: "http://localhost:80/evaluate-slope" externalSloUrl: "http://localhost:80/evaluate-slope"
warmup: 60 # in seconds warmup: 60 # in seconds
......
...@@ -44,7 +44,7 @@ spec: ...@@ -44,7 +44,7 @@ spec:
prometheusUrl: "http://prometheus-operated:9090" prometheusUrl: "http://prometheus-operated:9090"
offset: 0 offset: 0
properties: properties:
consumerGroup: uc3-hazelcastjet consumerGroup: theodolite-uc3-application
threshold: 2000 threshold: 2000
externalSloUrl: "http://localhost:80/evaluate-slope" externalSloUrl: "http://localhost:80/evaluate-slope"
warmup: 60 # in seconds warmup: 60 # in seconds
......
...@@ -45,7 +45,7 @@ spec: ...@@ -45,7 +45,7 @@ spec:
prometheusUrl: "http://prometheus-operated:9090" prometheusUrl: "http://prometheus-operated:9090"
offset: 0 offset: 0
properties: properties:
consumerGroup: uc4-hazelcastjet consumerGroup: theodolite-uc4-application
threshold: 2000 threshold: 2000
externalSloUrl: "http://localhost:80/evaluate-slope" externalSloUrl: "http://localhost:80/evaluate-slope"
warmup: 60 # in seconds warmup: 60 # in seconds
......
...@@ -51,6 +51,7 @@ services: ...@@ -51,6 +51,7 @@ services:
SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092 SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
KAFKA_BOOTSTRAP_SERVERS: kafka:9092 KAFKA_BOOTSTRAP_SERVERS: kafka:9092
SCHEMA_REGISTRY_URL: http://schema-registry:8081 SCHEMA_REGISTRY_URL: http://schema-registry:8081
ENABLE_METRICS: "false"
load-generator: load-generator:
image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-latest} image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-latest}
depends_on: depends_on:
......
...@@ -51,6 +51,7 @@ services: ...@@ -51,6 +51,7 @@ services:
SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092 SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
KAFKA_BOOTSTRAP_SERVERS: kafka:9092 KAFKA_BOOTSTRAP_SERVERS: kafka:9092
SCHEMA_REGISTRY_URL: http://schema-registry:8081 SCHEMA_REGISTRY_URL: http://schema-registry:8081
ENABLE_METRICS: "false"
load-generator: load-generator:
image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-latest} image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-latest}
depends_on: depends_on:
......
...@@ -51,6 +51,7 @@ services: ...@@ -51,6 +51,7 @@ services:
SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092 SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
KAFKA_BOOTSTRAP_SERVERS: kafka:9092 KAFKA_BOOTSTRAP_SERVERS: kafka:9092
SCHEMA_REGISTRY_URL: http://schema-registry:8081 SCHEMA_REGISTRY_URL: http://schema-registry:8081
ENABLE_METRICS: "false"
load-generator: load-generator:
image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-latest} image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-latest}
depends_on: depends_on:
......
...@@ -51,6 +51,7 @@ services: ...@@ -51,6 +51,7 @@ services:
SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092 SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
KAFKA_BOOTSTRAP_SERVERS: kafka:9092 KAFKA_BOOTSTRAP_SERVERS: kafka:9092
SCHEMA_REGISTRY_URL: http://schema-registry:8081 SCHEMA_REGISTRY_URL: http://schema-registry:8081
ENABLE_METRICS: "false"
load-generator: load-generator:
image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-latest} image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-latest}
depends_on: depends_on:
......
...@@ -21,7 +21,7 @@ import rocks.theodolite.benchmarks.commons.flink.util.SerializableSupplier; ...@@ -21,7 +21,7 @@ import rocks.theodolite.benchmarks.commons.flink.util.SerializableSupplier;
/** /**
* A class for creating {@link FlinkKafkaConsumer} and {@link FlinkKafkaProducer}. * A class for creating {@link FlinkKafkaConsumer} and {@link FlinkKafkaProducer}.
*/ */
public class KafkaConnectorFactory { public class KafkaConnectorFactory { // NOPMD
private static final String AUTO_OFFSET_RESET_EARLIEST = "earliest"; private static final String AUTO_OFFSET_RESET_EARLIEST = "earliest";
......
...@@ -3,6 +3,7 @@ package rocks.theodolite.benchmarks.commons.hazelcastjet; ...@@ -3,6 +3,7 @@ package rocks.theodolite.benchmarks.commons.hazelcastjet;
import com.hazelcast.config.Config; import com.hazelcast.config.Config;
import com.hazelcast.jet.Jet; import com.hazelcast.jet.Jet;
import com.hazelcast.jet.JetInstance; import com.hazelcast.jet.JetInstance;
import com.hazelcast.jet.config.JetConfig;
import org.slf4j.Logger; import org.slf4j.Logger;
/** /**
...@@ -48,13 +49,13 @@ public class JetInstanceBuilder { ...@@ -48,13 +49,13 @@ public class JetInstanceBuilder {
* @return JetInstance * @return JetInstance
*/ */
public JetInstance build() { public JetInstance build() {
final JetInstance jet = Jet.newJetInstance();
final Config localConfig = this.config; final Config localConfig = this.config;
if (localConfig == null) { if (localConfig == null) {
return jet; throw new IllegalStateException("No Hazelcast config set.");
} else { } else {
jet.getConfig().setHazelcastConfig(localConfig); final JetConfig jetConfig = new JetConfig();
return jet; jetConfig.setHazelcastConfig(localConfig);
return Jet.newJetInstance(jetConfig);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment