Skip to content

[improve][broker] Skip system cursor when check inactive cursor. #26149

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

Open
horizonzy wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

[improve][broker] Skip system cursor when check inactive cursor. #26149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3684,7 +3684,7 @@ public void checkInactiveSubscriptions(long expirationTimeMillis) {
subscriptions.forEach((subName, sub) -> {
if (sub.dispatcher != null && sub.dispatcher.isConsumerConnected()
|| sub.isReplicated()
|| isCompactionSubscription(subName)) {
|| isSystemCursor(subName)) {
return;
}
if (System.currentTimeMillis() - sub.cursor.getLastActive() > expirationTimeMillis) {
Expand Down
7 changes: 7 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,7 +1786,7 @@
.get());
@Cleanup
PulsarClient client = spy(PulsarClient.builder().serviceUrl(brokerUrl.toString()).build());
PulsarClientImpl clientImpl = (PulsarClientImpl) client;

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Proxy 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Brokers - Broker Group 4 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Other 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Brokers - Client Impl 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Brokers - Client Api 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Brokers - Broker Group 2 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Brokers - Broker Group 3 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Brokers - Broker Group 5 

You're assigning an auto-cleanup variable to something else. This is a bad idea.

Check warning on line 1789 in pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java

View workflow job for this annotation

GitHub Actions / CI - Unit - Brokers - Broker Group 1 

You're assigning an auto-cleanup variable to something else. This is a bad idea.
doReturn(new CompletableFuture<Producer>()).when(clientImpl)
.createProducerAsync(any(ProducerConfigurationData.class), any(Schema.class));

Expand Down Expand Up @@ -2080,6 +2080,7 @@
@Test
public void testCheckInactiveSubscriptions() throws Exception {
pulsarTestContext.getConfig().setSubscriptionExpirationTimeMinutes(5);
pulsarTestContext.getConfig().setAdditionalSystemCursorNames(Set.of("additionalSystemCursor"));
PersistentTopic topic = new PersistentTopic(successTopicName, ledgerMock, brokerService);

final var subscriptions = new ConcurrentHashMap<String, PersistentSubscription>();
Expand All @@ -2098,6 +2099,11 @@
spyWithClassAndConstructorArgsRecordingInvocations(PersistentSubscription.class, topic,
"nonDeletableSubscription2", cursorMock, true);
subscriptions.put(nonDeletableSubscription2.getName(), nonDeletableSubscription2);
// This subscription is an additional system cursor.
PersistentSubscription nonDeletableSubscription3 =
spyWithClassAndConstructorArgsRecordingInvocations(PersistentSubscription.class, topic,
"additionalSystemCursor", cursorMock, false);
subscriptions.put(nonDeletableSubscription3.getName(), nonDeletableSubscription3);

Field field = topic.getClass().getDeclaredField("subscriptions");
field.setAccessible(true);
Expand All @@ -2122,6 +2128,7 @@
verify(nonDeletableSubscription1, times(0)).delete();
verify(deletableSubscription1, times(1)).delete();
verify(nonDeletableSubscription2, times(0)).delete();
verify(nonDeletableSubscription3, times(0)).delete();
}

@Test
Expand Down
Loading