KAFKA-24599: merge upstream v1.4.7 into mirrored master and fix merge #69
Conversation
… conflicts and tests
There was a problem hiding this comment.
I think you were running into the issue (that necessitated deleting the test) because you were building for older versions of Kafka (the test only runs for old versions of Kafka)
I think we should only build for 1.1.0 (the version we support at Yelp) since it will reduce build times and noise. An argument could be made for including newer versions, but I think we can just do that when we upgrade.
.travis.yml
Outdated
| @@ -10,7 +10,12 @@ python: | |||
| - pypy2.7-6.0 | |||
|
|
|||
| env: | |||
| - KAFKA_VERSION=1.1.0 | |||
There was a problem hiding this comment.
We only run 1.1.0, so let's skip testing for other versions
| @@ -0,0 +1,145 @@ | |||
| # Licensed to the Apache Software Foundation (ASF) under one or more | |||
There was a problem hiding this comment.
Since we're only running 1.1.0, we don't need files for the other versions
…ons which are relevant internally
…old since it won't get run for our version anyway; increase timeout on assert_message_count to avoid test failures
build_integration.sh
Outdated
| @@ -1,12 +1,12 @@ | |||
| #!/bin/bash | |||
|
|
|||
| : ${ALL_RELEASES:="1.1.0"} | |||
There was a problem hiding this comment.
(Sorry, I meant to comment on the RHS of the diff -- in the new version it appears to be ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.0 1.1.1 2.0.1"}
All testing is documented in the internal JIRA ticket.
One significant modification which was required in the merge process was the removal of the
test_kafka_consumer_offsets_for_time_oldtest case which was causing Zookeeper to encounter a RuntimeError due to the test exceeding the specified max_timeout. All other tests passed (make test,make itest,make test27, andmake test35).This change is