Skip to content

[rdkafka] Don't do unnecessary subscribe\unsubscribe on every receive call #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2018
Merged
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
8 changes: 5 additions & 3 deletions pkg/rdkafka/RdKafkaConsumer.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ public function getQueue()
*/
public function receive($timeout = 0)
{
$this->consumer->subscribe([$this->topic->getTopicName()]);
if (false == $this->subscribed) {
$this->consumer->subscribe([$this->topic->getTopicName()]);

$this->subscribed = true;
}

$message = null;
if ($timeout > 0) {
Expand All @@ -95,8 +99,6 @@ public function receive($timeout = 0)
}
}

$this->consumer->unsubscribe();

return $message;
}

Expand Down
16 changes: 15 additions & 1 deletion pkg/rdkafka/RdKafkaContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,18 @@ class RdKafkaContext implements PsrContext
*/
private $producer;

/**
* @var KafkaConsumer[]
*/
private $kafkaConsumers;

/**
* @param array $config
*/
public function __construct(array $config)
{
$this->config = $config;
$this->kafkaConsumers = [];

$this->setSerializer(new JsonSerializer());
}
Expand Down Expand Up @@ -94,8 +100,10 @@ public function createConsumer(PsrDestination $destination)
{
InvalidDestinationException::assertDestinationInstanceOf($destination, RdKafkaTopic::class);

$this->kafkaConsumers[] = $kafkaConsumer = new KafkaConsumer($this->getConf());

$consumer = new RdKafkaConsumer(
new KafkaConsumer($this->getConf()),
$kafkaConsumer,
$this,
$destination,
$this->getSerializer()
Expand All @@ -113,6 +121,12 @@ public function createConsumer(PsrDestination $destination)
*/
public function close()
{
$kafkaConsumers = $this->kafkaConsumers;
$this->kafkaConsumers = [];

foreach ($kafkaConsumers as $kafkaConsumer) {
$kafkaConsumer->unsubscribe();
}
}

/**
Expand Down
35 changes: 29 additions & 6 deletions pkg/rdkafka/Tests/RdKafkaConsumerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,34 @@ public function testShouldReceiveFromQueueAndReturnNullIfNoMessageInQueue()
->with(1000)
->willReturn($kafkaMessage)
;

$consumer = new RdKafkaConsumer(
$kafkaConsumer,
$this->createContextMock(),
$destination,
$this->createSerializerMock()
);

$this->assertNull($consumer->receive(1000));
}

public function testShouldSubscribeOnFirstReceiveOnly()
{
$destination = new RdKafkaTopic('dest');

$kafkaMessage = new Message();
$kafkaMessage->err = RD_KAFKA_RESP_ERR__TIMED_OUT;

$kafkaConsumer = $this->createKafkaConsumerMock();
$kafkaConsumer
->expects($this->once())
->method('unsubscribe')
->method('subscribe')
->with(['dest'])
;
$kafkaConsumer
->expects($this->any())
->method('consume')
->willReturn($kafkaMessage)
;

$consumer = new RdKafkaConsumer(
Expand All @@ -71,7 +96,9 @@ public function testShouldReceiveFromQueueAndReturnNullIfNoMessageInQueue()
$this->createSerializerMock()
);

$this->assertNull($consumer->receive(1000));
$consumer->receive(1000);
$consumer->receive(1000);
$consumer->receive(1000);
}

public function testShouldReceiveFromQueueAndReturnMessageIfMessageInQueue()
Expand All @@ -96,10 +123,6 @@ public function testShouldReceiveFromQueueAndReturnMessageIfMessageInQueue()
->with(1000)
->willReturn($kafkaMessage)
;
$kafkaConsumer
->expects($this->once())
->method('unsubscribe')
;

$serializer = $this->createSerializerMock();
$serializer
Expand Down