openstack/deb-python-kafka
Code Issues Proposed changes

Change coordinator.needs_join_prepare -> coordinator.rejoining; fix consumer group test (#795)

Browse Source
This commit is contained in:
Dana Powers
2016-08-04 15:31:41 -07:00
committed by GitHub
parent 68c8fa4ad0
commit bccac7bca1
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kafka/coordinator/base.py
View File

@@ -89,7 +89,7 @@ class BaseCoordinator(object):
self.group_id = self.config['group_id'] self.group_id = self.config['group_id']
self.coordinator_id = None self.coordinator_id = None
self.rejoin_needed = True self.rejoin_needed = True
self.needs_join_prepare = True self.rejoining = False
self.heartbeat = Heartbeat(**self.config) self.heartbeat = Heartbeat(**self.config)
self.heartbeat_task = HeartbeatTask(weakref.proxy(self)) self.heartbeat_task = HeartbeatTask(weakref.proxy(self))
self.sensors = GroupCoordinatorMetrics(self.heartbeat, metrics, self.sensors = GroupCoordinatorMetrics(self.heartbeat, metrics,
@@ -235,9 +235,9 @@ class BaseCoordinator(object):
if not self.need_rejoin(): if not self.need_rejoin():
return return
if self.needs_join_prepare: if not self.rejoining:
self._on_join_prepare(self.generation, self.member_id) self._on_join_prepare(self.generation, self.member_id)
self.needs_join_prepare = False self.rejoining = True
while self.need_rejoin(): while self.need_rejoin():
self.ensure_coordinator_known() self.ensure_coordinator_known()
@@ -249,7 +249,7 @@ class BaseCoordinator(object):
member_assignment_bytes = future.value member_assignment_bytes = future.value
self._on_join_complete(self.generation, self.member_id, self._on_join_complete(self.generation, self.member_id,
self.protocol, member_assignment_bytes) self.protocol, member_assignment_bytes)
self.needs_join_prepare = True self.rejoining = False
self.heartbeat_task.reset() self.heartbeat_task.reset()
else: else:
assert future.failed() assert future.failed()

7
test/test_consumer_group.py
View File

@@ -95,7 +95,12 @@ def test_group(kafka_broker, topic):
generations = set([consumer._coordinator.generation generations = set([consumer._coordinator.generation
for consumer in list(consumers.values())]) for consumer in list(consumers.values())])
if len(generations) == 1: # New generation assignment is not complete until
# coordinator.rejoining = False
rejoining = any([consumer._coordinator.rejoining
for consumer in list(consumers.values())])
if not rejoining and len(generations) == 1:
for c, consumer in list(consumers.items()): for c, consumer in list(consumers.items()):
logging.info("[%s] %s %s: %s", c, logging.info("[%s] %s %s: %s", c,
consumer._coordinator.generation, consumer._coordinator.generation,