rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 15:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3575 from rgerhards/ci-bump-kafka

Browse Source 
testbench: bump kafka version
This commit is contained in:
Rainer Gerhards 2019-03-28 14:21:14 +01:00 committed by GitHub
commit d56541a7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/diag.sh
View File

@ -1372,12 +1372,8 @@ dep_cache_dir=$(pwd)/.dep_cache
dep_zk_url=http://www-us.apache.org/dist/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz
dep_zk_cached_file=$dep_cache_dir/zookeeper-3.4.13.tar.gz
# byANDRE: We stay with kafka 0.10.x for now. Newer Kafka Versions have changes that
# makes creating testbench with single kafka instances difficult.
# old version -> dep_kafka_url=http://www-us.apache.org/dist/kafka/0.10.2.2/kafka_2.12-0.10.2.2.tgz
# old version -> dep_kafka_cached_file=$dep_cache_dir/kafka_2.12-0.10.2.2.tgz
dep_kafka_url=http://www-us.apache.org/dist/kafka/2.0.0/kafka_2.11-2.0.0.tgz
dep_kafka_cached_file=$dep_cache_dir/kafka_2.11-2.0.0.tgz
dep_kafka_url=http://www-us.apache.org/dist/kafka/2.2.0/kafka_2.12-2.2.0.tgz
dep_kafka_cached_file=$dep_cache_dir/kafka_2.12-2.2.0.tgz
if [ -z "$ES_DOWNLOAD" ]; then
export ES_DOWNLOAD=elasticsearch-5.6.9.tar.gz
@ -1451,6 +1447,7 @@ download_kafka() {
wget $dep_kafka_url -O $dep_kafka_cached_file
if [ $? -ne 0 ]
then
rm $dep_kafka_cached_file # a 0-size file may be left over
error_exit 1
fi
fi
@ -1622,6 +1619,8 @@ start_zookeeper() {
}
start_kafka() {
printf '%s starting kafka\n' "$(tb_timestamp)"
# Force IPv4 usage of Kafka!
export KAFKA_OPTS="-Djava.net.preferIPv4Stack=True"
if [ "x$1" == "x" ]; then
@ -1632,7 +1631,6 @@ start_kafka() {
dep_work_kafka_config="kafka-server$1.properties"
fi
# shellcheck disable=SC2009 - we do not grep on the process name!
kafkapid=$(ps aux | grep -i $dep_work_kafka_config | grep java | grep -v grep | awk '{print $2}')
if [ "$KEEP_KAFKA_RUNNING" == "YES" ] && [ "$kafkapid" != "" ]; then