Skip to content

consumer support update stats with specified stats #8951

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.

Sign up for GitHub

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
sijie merged 2 commits into from
Dec 15, 2020
Merged

consumer support update stats with specified stats #8951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f81f3e6
consumer support update stats with specified stats
dockerzhang Dec 14, 2020
fe7cbc4
move UT to ConsumerStatsTest
dockerzhang Dec 15, 2020
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
12 changes: 12 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,18 @@ public void updateRates() {
stats.chuckedMessageRate = chuckedMessageRate.getRate();
}

public void updateStats(ConsumerStats consumerStats) {
msgOutCounter.add(consumerStats.msgOutCounter);
bytesOutCounter.add(consumerStats.bytesOutCounter);
msgOut.recordMultipleEvents(consumerStats.msgOutCounter, consumerStats.bytesOutCounter);
lastAckedTimestamp = consumerStats.lastAckedTimestamp;
lastConsumedTimestamp = consumerStats.lastConsumedTimestamp;
MESSAGE_PERMITS_UPDATER.set(this, consumerStats.availablePermits);
unackedMessages = consumerStats.unackedMessages;
blockedConsumerOnUnackedMsgs = consumerStats.blockedConsumerOnUnackedMsgs;
AVG_MESSAGES_PER_ENTRY.set(this, consumerStats.avgMessagesPerEntry);
}

public ConsumerStats getStats() {
stats.msgOutCounter = msgOutCounter.longValue();
stats.bytesOutCounter = bytesOutCounter.longValue();
Expand Down
27 changes: 27 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.policies.data.TopicStats;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.common.policies.data.ConsumerStats;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

import java.util.List;
import java.util.concurrent.TimeUnit;

@Slf4j
Expand Down Expand Up @@ -140,4 +143,28 @@ public void testAckStatsOnPartitionedTopicForExclusiveSubscription() throws Puls
}
}

@Test
public void testUpdateStatsForActiveConsumerAndSubscription() throws Exception {
final String topicName = "persistent://prop/use/ns-abc/testUpdateStatsForActiveConsumerAndSubscription";
pulsarClient.newConsumer()
.topic(topicName)
.subscriptionType(SubscriptionType.Shared)
.subscriptionName("my-subscription")
.subscribe();

PersistentTopic topicRef = (PersistentTopic) pulsar.getBrokerService().getTopicReference(topicName).get();
Assert.assertNotNull(topicRef);
Assert.assertEquals(topicRef.getSubscriptions().size(), 1);
List<org.apache.pulsar.broker.service.Consumer> consumers = topicRef.getSubscriptions()
.get("my-subscription").getConsumers();
Assert.assertEquals(consumers.size(), 1);
ConsumerStats consumerStats = new ConsumerStats();
consumerStats.msgOutCounter = 10;
consumerStats.bytesOutCounter = 1280;
consumers.get(0).updateStats(consumerStats);
ConsumerStats updatedStats = consumers.get(0).getStats();

Assert.assertEquals(updatedStats.msgOutCounter, 10);
Assert.assertEquals(updatedStats.bytesOutCounter, 1280);
}
}