Skip to content

Commit 3c68df5

Browse files
author
Gabriel Tincu
committed
Implement PR change requests: fewer versions for travis testing, remove unused older versions for inference code, remove one minor version from known server list
Do not use newly created ACL request / responses in allowed version lists, due to flexible versions enabling in kafka actually requiring a serialization protocol header update Revert admin client file change
1 parent 3952b9a commit 3c68df5

File tree

9 files changed

+6
-211
lines changed

9 files changed

+6
-211
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ env:
1414
- KAFKA_VERSION=0.10.2.2
1515
- KAFKA_VERSION=0.11.0.3
1616
- KAFKA_VERSION=1.1.1
17-
- KAFKA_VERSION=2.0.1
18-
- KAFKA_VERSION=2.1.1
19-
- KAFKA_VERSION=2.2.0
20-
- KAFKA_VERSION=2.3.0
2117
- KAFKA_VERSION=2.4.0
2218
- KAFKA_VERSION=2.5.0
2319

build_integration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
: ${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.1 2.0.1 2.1.1 2.2.0 2.2.1 2.3.0 2.4.0 2.5.0"}
3+
: ${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.1 2.0.1 2.1.1 2.2.1 2.3.0 2.4.0 2.5.0"}
44
: ${SCALA_VERSION:=2.11}
55
: ${DIST_BASE_URL:=https://archive.apache.org/dist/kafka/}
66
: ${KAFKA_SRC_GIT:=https://github.com/apache/kafka.git}

kafka/admin/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ def delete_acls(self, acl_filters):
763763
request = DeleteAclsRequest[version](
764764
filters=[self._convert_delete_acls_resource_request_v0(acl) for acl in acl_filters]
765765
)
766-
elif version <= 1:
766+
elif version <= 2:
767767
request = DeleteAclsRequest[version](
768768
filters=[self._convert_delete_acls_resource_request_v1(acl) for acl in acl_filters]
769769
)

kafka/conn.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from kafka.future import Future
2525
from kafka.metrics.stats import Avg, Count, Max, Rate
2626
from kafka.oauth.abstract import AbstractTokenProvider
27-
from kafka.protocol.admin import SaslHandShakeRequest, DescribeAclsRequest
27+
from kafka.protocol.admin import SaslHandShakeRequest, DescribeAclsRequest_v2
2828
from kafka.protocol.commit import OffsetFetchRequest
2929
from kafka.protocol.offset import OffsetRequest
3030
from kafka.protocol.produce import ProduceRequest
@@ -1169,7 +1169,7 @@ def _infer_broker_version_from_api_versions(self, api_versions):
11691169
# in reverse order. As soon as we find one that works, return it
11701170
test_cases = [
11711171
# format (<broker version>, <needed struct>)
1172-
((2, 5, 0), DescribeAclsRequest[2]),
1172+
((2, 5, 0), DescribeAclsRequest_v2),
11731173
((2, 4, 0), ProduceRequest[8]),
11741174
((2, 3, 0), FetchRequest[11]),
11751175
((2, 2, 0), OffsetRequest[5]),
@@ -1180,10 +1180,6 @@ def _infer_broker_version_from_api_versions(self, api_versions):
11801180
((0, 11, 0), MetadataRequest[4]),
11811181
((0, 10, 2), OffsetFetchRequest[2]),
11821182
((0, 10, 1), MetadataRequest[2]),
1183-
# taken from https://github.com/edenhill/librdkafka/blob/master/src/rdkafka_feature.c#L234
1184-
((0, 9, 0), ProduceRequest[1]),
1185-
((0, 8, 2), OffsetFetchRequest[1]),
1186-
((0, 8, 1), OffsetFetchRequest[0]),
11871183
]
11881184

11891185
# Get the best match of test cases

kafka/protocol/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,8 @@ class DescribeAclsRequest_v2(Request):
523523
SCHEMA = DescribeAclsRequest_v1.SCHEMA
524524

525525

526-
DescribeAclsRequest = [DescribeAclsRequest_v0, DescribeAclsRequest_v1, DescribeAclsRequest_v2]
527-
DescribeAclsResponse = [DescribeAclsResponse_v0, DescribeAclsResponse_v1, DescribeAclsResponse_v2]
526+
DescribeAclsRequest = [DescribeAclsRequest_v0, DescribeAclsRequest_v1]
527+
DescribeAclsResponse = [DescribeAclsResponse_v0, DescribeAclsResponse_v1]
528528

529529
class CreateAclsResponse_v0(Response):
530530
API_KEY = 30

servers/2.2.0/resources/kafka.properties

Lines changed: 0 additions & 147 deletions
This file was deleted.

servers/2.2.0/resources/kafka_server_jaas.conf

Lines changed: 0 additions & 4 deletions
This file was deleted.

servers/2.2.0/resources/log4j.properties

Lines changed: 0 additions & 25 deletions
This file was deleted.

servers/2.2.0/resources/zookeeper.properties

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)