diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7e431002e7bf214f377b7458d2eba235b7b6050..05ea0e7d9821988ca034a1fa8f28c4ec1a224983 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,6 @@ checkstyle: tags: - exec-docker script: ./gradlew checkstyle --continue - allow_failure: true artifacts: paths: - "*/build/reports/checkstyle/main.html" @@ -58,7 +57,6 @@ pmd: tags: - exec-docker script: ./gradlew pmd --continue - allow_failure: true artifacts: paths: - "*/build/reports/pmd/*.html" @@ -70,7 +68,6 @@ spotbugs: tags: - exec-docker script: ./gradlew spotbugs --continue - allow_failure: true artifacts: paths: - "*/build/reports/spotbugs/*.html" diff --git a/docs/release-process.md b/docs/release-process.md index 097890f5fb446f69902c0537fefe4f0f0a2c2bd5..f267d611fb08931dd766c2f9952655f9dae62e32 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -1,15 +1,14 @@ # Release Process -We assume that we are creating the release `v0.1.1`. Please make sure to update -to modify the following steps according to the release, you are actually -performing. +We assume that we are creating the release `v0.1.1`. Please make sure to adjust +the following steps according to the release, you are actually performing. 1. Create a new branch `v0.1` if not already exists. This branch will never again be merged into master. -2. Checkout the `v0.1 branch. +2. Checkout the `v0.1` branch. -3. Update all references to Theodolite Docker images to tag `v0-1-1`. These are +3. Update all references to Theodolite Docker images to tag `v0.1.1`. These are mainly the Kubernetes resource definitions in `execution` as well as the Docker Compose files in `docker-test`. diff --git a/execution/README.md b/execution/README.md index 3c666dc7740331d7590194151ed01a1931712db8..7a71cf0d73d6dd737c181dc138a1dd4a7fb0dc30 100644 --- a/execution/README.md +++ b/execution/README.md @@ -167,7 +167,7 @@ The `./theodolite.py` is the entrypoint for all benchmark executions. Is has to * `<commit-interval>`: Kafka Streams' commit interval in milliseconds. Optional. Default `100`. * `<duration>`: Duration in minutes subexperiments should be executed for. Optional. Default `5`. * `<domain-restriction>`: The domain restriction: `domain-restriction` to use domain restriction `no-domain-restriction` to not use domain restriction. Default `no-domain-restriction`. For more details see Section _Domain Restriction_. -* `<search-strategy>`: The benchmarking search strategy. Can be set to `check_all`, `linear-search` or `binary-search`. Default `default`. For more details see Section _Benchmarking Search Strategies_. +* `<search-strategy>`: The benchmarking search strategy. Can be set to `check-all`, `linear-search` or `binary-search`. Default `check-all`. For more details see Section _Benchmarking Search Strategies_. ### Domain Restriction For dimension value, we have a domain of the amounts of instances. As a consequence, for each dimension value the maximum number of lag experiments is equal to the size of the domain. How the domain is determined is defined by the following domain restriction strategies. @@ -180,7 +180,7 @@ For dimension value, we have a domain of the amounts of instances. As a conseque ### Benchmarking Search Strategies There are the following benchmarking strategies: -* `check_all`: For each dimension value, execute one lag experiment for all amounts of instances within the current domain. +* `check-all`: For each dimension value, execute one lag experiment for all amounts of instances within the current domain. * `linear-search`: A heuristic which works as follows: For each dimension value, execute one lag experiment for all number of instances within the current domain. The execution order is from the lowest number of instances to the highest amount of instances and the execution for each dimension value is stopped, when a suitable amount of instances is found or if all lag experiments for the dimension value were not successful. * `binary-search`: A heuristic which works as follows: For each dimension value, execute one lag experiment for all number of instances within the current domain. The execution order is in a binary-search-like manner. The execution is stopped, when a suitable amount of instances is found or if all lag experiments for the dimension value were not successful. diff --git a/execution/strategies/tests/.cache/v/cache/lastfailed b/execution/strategies/tests/.cache/v/cache/lastfailed deleted file mode 100644 index 41d320cbb9ee336327abe5982f86533c0ea7ac61..0000000000000000000000000000000000000000 --- a/execution/strategies/tests/.cache/v/cache/lastfailed +++ /dev/null @@ -1,3 +0,0 @@ -{ - "test_step_strategy.py": true -} \ No newline at end of file diff --git a/execution/strategies/tests/.gitignore b/execution/strategies/tests/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..1998c294f84ec0ff4b32396e4cd8e74e352672e6 --- /dev/null +++ b/execution/strategies/tests/.gitignore @@ -0,0 +1 @@ +.cache \ No newline at end of file diff --git a/uc2-application/.settings/org.eclipse.jdt.ui.prefs b/uc2-application/.settings/org.eclipse.jdt.ui.prefs index 4e04e2891754324a6e1bf55348b6a38f592bb301..fa98ca63d77bdee891150bd6713f70197a75cefc 100644 --- a/uc2-application/.settings/org.eclipse.jdt.ui.prefs +++ b/uc2-application/.settings/org.eclipse.jdt.ui.prefs @@ -32,7 +32,7 @@ cleanup.qualify_static_member_accesses_with_declaring_class=true cleanup.qualify_static_method_accesses_with_declaring_class=false cleanup.remove_private_constructors=true cleanup.remove_redundant_modifiers=false -cleanup.remove_redundant_semicolons=false +cleanup.remove_redundant_semicolons=true cleanup.remove_redundant_type_arguments=true cleanup.remove_trailing_whitespaces=true cleanup.remove_trailing_whitespaces_all=true diff --git a/uc2-application/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java b/uc2-application/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java index c09fa3ead7553bda5cd8e8f09079f846b89d5d17..6a254d9b75ae3d9d39cf9dd887f6d4fccb6119c4 100644 --- a/uc2-application/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java +++ b/uc2-application/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java @@ -17,8 +17,6 @@ import org.apache.kafka.streams.kstream.Suppressed.BufferConfig; import org.apache.kafka.streams.kstream.TimeWindows; import org.apache.kafka.streams.kstream.Windowed; import org.apache.kafka.streams.kstream.WindowedSerdes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; import titan.ccp.configuration.events.Event; import titan.ccp.configuration.events.EventSerde; @@ -38,7 +36,7 @@ public class TopologyBuilder { private final Duration emitPeriod; private final Duration gracePeriod; - // SERDEs + // Serdes private final SchemaRegistryAvroSerdeFactory srAvroSerdeFactory; private final StreamsBuilder builder = new StreamsBuilder(); diff --git a/uc3-application/build.gradle b/uc3-application/build.gradle index 82df66fae434e5b0a0f9b31ef9a44f04ca857173..aa96b6dbf90c4895dfda57a51c753c9103c29414 100644 --- a/uc3-application/build.gradle +++ b/uc3-application/build.gradle @@ -1,13 +1 @@ -allprojects { - repositories { - maven { - url 'https://packages.confluent.io/maven/' - } - } -} - -dependencies { - compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') -} - mainClassName = "theodolite.uc3.application.HistoryService" diff --git a/uc4-application/build.gradle b/uc4-application/build.gradle index c5891b2bfb2073e829ff7013e47a17b1ac2313e5..56663022144166711d6bebce0f6480e358a738b5 100644 --- a/uc4-application/build.gradle +++ b/uc4-application/build.gradle @@ -1,13 +1 @@ -allprojects { - repositories { - maven { - url 'https://packages.confluent.io/maven/' - } - } -} - -dependencies { - compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') -} - mainClassName = "theodolite.uc4.application.HistoryService"