Skip to content
Draft
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
3 changes: 2 additions & 1 deletion nri-kafka/src/Kafka/Worker/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ createConsumer
++ Consumer.compression Consumer.Snappy
++ Consumer.extraProps
( Dict.fromList
[("max.poll.interval.ms", Text.fromInt (Settings.unMaxPollIntervalMs maxPollIntervalMs))]
[("max.poll.interval.ms", Text.fromInt (Settings.unMaxPollIntervalMs maxPollIntervalMs))
, ("partition.assignment.strategy", "range,cooperative-sticky")]
)
let subscription' =
Consumer.topics [Consumer.TopicName (Kafka.unTopic topic)]
Expand Down
17 changes: 12 additions & 5 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,23 @@ pg_ctl start -o '-k .'
mkdir -p ./_build/redis/data
redis-server --daemonize yes --dir ./_build/redis/data

## start zookeeper (for kafka)
## start zookeeper (for kafka)
zk_server_properties_path=$(dirname "$(which zkServer.sh)")/../conf/zoo_sample.cfg
mkdir -p /tmp/zookeeper /tmp/zookeeper-logs
ZOOPIDFILE=/tmp/zookeeper-logs/pid ZOO_LOG_DIR=/tmp/zookeeper-logs zkServer.sh stop zoo_sample.cfg
ZOOPIDFILE=/tmp/zookeeper-logs/pid \
ZOO_LOG_DIR=/tmp/zookeeper-logs \
zkServer.sh stop "$zk_server_properties_path"
rm -rf /tmp/zookeeper/* /tmp/zookeeper-logs/*
ZOOPIDFILE=/tmp/zookeeper-logs/pid ZOO_LOG_DIR=/tmp/zookeeper-logs zkServer.sh start zoo_sample.cfg
ZOOPIDFILE=/tmp/zookeeper-logs/pid \
ZOO_LOG_DIR=/tmp/zookeeper-logs \
zkServer.sh start "$zk_server_properties_path"

## wait for zookeeper
echo "waiting for zookeeper to start"
until nc -vz localhost 2181
do
sleep 1
done
done
echo "zookeeper available"

## start kafka
Expand All @@ -50,4 +55,6 @@ cabal test all

# cleanup
kafka-server-stop.sh
ZOOPIDFILE=/tmp/zookeeper-logs/pid ZOO_LOG_DIR=/tmp/zookeeper-logs zkServer.sh stop zoo_sample.cfg
ZOOPIDFILE=/tmp/zookeeper-logs/pid \
ZOO_LOG_DIR=/tmp/zookeeper-logs \
zkServer.sh stop "$zk_server_properties_path"