Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/storm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
ARG base_image=kilda/base-ubuntu
FROM ${base_image}

ENV PACKAGE apache-storm-2.6.1
ENV PACKAGE apache-storm-2.6.2

WORKDIR /tmp/

RUN \
apt -y update \
&& apt -y install net-tools jq \
&& wget -q https://archive.apache.org/dist/storm/apache-storm-2.6.1/$PACKAGE.tar.gz \
&& wget -q https://archive.apache.org/dist/storm/apache-storm-2.6.1/$PACKAGE.tar.gz.sha512 \
&& wget -q https://archive.apache.org/dist/storm/apache-storm-2.6.2/$PACKAGE.tar.gz \
&& wget -q https://archive.apache.org/dist/storm/apache-storm-2.6.2/$PACKAGE.tar.gz.sha512 \
&& sha512sum -c $PACKAGE.tar.gz.sha512 \
&& tar -xzf $PACKAGE.tar.gz --directory /opt/ \
&& ln -s /opt/$PACKAGE /opt/storm \
Expand Down
4 changes: 2 additions & 2 deletions docker/storm/simple-storm-supervisor-healthcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ set -o pipefail
/usr/bin/jps | grep Supervisor || exit 1


CONFIG=${1:-/opt/apache-storm-2.6.1/conf/storm.yaml}
LOG_FILE=${2:-/opt/apache-storm-2.6.1/logs/supervisor.log}
CONFIG=${1:-/opt/apache-storm-2.6.2/conf/storm.yaml}
LOG_FILE=${2:-/opt/apache-storm-2.6.2/logs/supervisor.log}

PORTS_NUBER_IN_CONFIG=$(cat ${CONFIG} | sed -n '/supervisor.slots.ports/,/^$/p' | grep -v supervisor.slots.ports | grep -v '^$' | awk -F '-' '{ print $2}' | wc -l )
PORTS_NUMBER_IN_LOGS=$(head -1000 ${LOG_FILE} | grep 'Starting in state' | wc -l )
Expand Down
2 changes: 1 addition & 1 deletion docker/storm/simple-storm-ui-healthcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -o pipefail
/usr/bin/jps | grep --silent UIServer || exit 1


CONFIG=${1:-/opt/apache-storm-2.6.1/conf/storm.yaml}
CONFIG=${1:-/opt/apache-storm-2.6.2/conf/storm.yaml}

PORTS_NUBER_IN_CONFIG=$(cat ${CONFIG} | sed -n '/supervisor.slots.ports/,/^$/p' | grep -v supervisor.slots.ports | grep -v '^$' | awk -F '-' '{ print $2}' | wc -l )
ACTUAL_SLOTS=$(curl -q 127.0.0.1:8080/api/v1/cluster/summary 2>/dev/null | jq -r '.slotsTotal')
Expand Down
4 changes: 2 additions & 2 deletions src-java/base-topology/base-storm-topology/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
api(project(":kilda-persistence-api"))
api(project(":blue-green"))
api("org.squirrelframework:squirrel-foundation")
api("org.apache.storm:storm-kafka-client:2.6.1")
api("org.apache.storm:storm-kafka-client:2.6.2")
api("com.google.guava:guava")
api("org.apache.commons:commons-lang3")
api("org.apache.commons:commons-collections4")
Expand All @@ -42,7 +42,7 @@ dependencies {
implementation(project(":grpc-api"))
implementation("org.yaml:snakeyaml:2.2")
implementation("org.rocksdb:rocksdbjni:8.10.0") { because("Storm integration tests require it") }
implementation("org.apache.storm:flux-core:2.6.1")
implementation("org.apache.storm:flux-core:2.6.2")

/**
* This dependency must be compileOnly to prevent storm to be packed via transitive dependencies into the shadowJar,
Expand Down
8 changes: 4 additions & 4 deletions src-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ subprojects {
annotationProcessor("org.projectlombok:lombok-mapstruct-binding:0.2.0")
testAnnotationProcessor("org.projectlombok:lombok-mapstruct-binding:0.2.0")

compileOnly("org.apache.storm:storm-core:2.6.1")
testImplementation("org.apache.storm:storm-core:2.6.1")
implementation("org.apache.storm:storm-kafka-client:2.6.1")
compileOnly("org.apache.storm:storm-core:2.6.2")
testImplementation("org.apache.storm:storm-core:2.6.2")
implementation("org.apache.storm:storm-kafka-client:2.6.2")
implementation("com.esotericsoftware:kryo:5.6.0")

implementation("org.squirrelframework:squirrel-foundation:0.3.10")
Expand Down Expand Up @@ -210,7 +210,7 @@ configure(subprojects.findAll { it.name.endsWith("-topology") }) {
}

dependencies {
localStormRuntime "org.apache.storm:storm-core:2.6.1"
localStormRuntime "org.apache.storm:storm-core:2.6.2"
}

sourceSets {
Expand Down