-
Notifications
You must be signed in to change notification settings - Fork 176
[BUG] MessageConsumer.isFinished() not set properly in certain conditions #1339
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
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,9 +53,14 @@ class NatsMessageConsumer extends NatsMessageConsumerBase implements PullManager | |
public void heartbeatError() { | ||
try { | ||
// just close the current sub and make another one. | ||
// this could go on endlessly | ||
lenientClose(); | ||
doSub(); | ||
// this could go on endlessly - unless the user had called stop | ||
if (stopped.get()) { | ||
finish(true); | ||
} | ||
else { | ||
lenientClose(); | ||
doSub(); | ||
} | ||
} | ||
catch (JetStreamApiException | IOException e) { | ||
pmm.resetTracking(); | ||
|
@@ -67,7 +72,7 @@ void doSub() throws JetStreamApiException, IOException { | |
MessageHandler mh = userMessageHandler == null ? null : msg -> { | ||
userMessageHandler.onMessage(msg); | ||
if (stopped.get() && pmm.noMorePending()) { | ||
finished.set(true); | ||
finish(false); | ||
} | ||
}; | ||
super.initSub(subscriptionMaker.subscribe(mh, userDispatcher, pmm, null)); | ||
|
@@ -78,7 +83,12 @@ void doSub() throws JetStreamApiException, IOException { | |
|
||
@Override | ||
public void pendingUpdated() { | ||
if (!stopped.get() && (pmm.pendingMessages <= thresholdMessages || (pmm.trackingBytes && pmm.pendingBytes <= thresholdBytes))) | ||
if (stopped.get()) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We have no more pending and the user has called stop, so we are finished with this consume |
||
if (pmm.noMorePending()) { | ||
finish(false); | ||
} | ||
} | ||
else if (pmm.pendingMessages <= thresholdMessages || (pmm.trackingBytes && pmm.pendingBytes <= thresholdBytes)) | ||
{ | ||
repull(); | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1303,20 +1303,20 @@ public void testOverflowFetch() throws Exception { | |
|
||
FetchConsumeOptions fcoNoMin = FetchConsumeOptions.builder() | ||
.maxMessages(5) | ||
.expiresIn(2000) | ||
.expiresIn(3000) | ||
.group(group) | ||
.build(); | ||
|
||
FetchConsumeOptions fcoOverA = FetchConsumeOptions.builder() | ||
.maxMessages(5) | ||
.expiresIn(2000) | ||
.expiresIn(3000) | ||
.group(group) | ||
.minAckPending(5) | ||
.build(); | ||
|
||
FetchConsumeOptions fcoOverB = FetchConsumeOptions.builder() | ||
.maxMessages(5) | ||
.expiresIn(2000) | ||
.expiresIn(3000) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this test was flapping, so added a little extra time |
||
.group(group) | ||
.minAckPending(6) | ||
.build(); | ||
|
@@ -1495,4 +1495,34 @@ public void testOverflowConsume() throws Exception { | |
assertEquals(0, overCount.get()); | ||
}); | ||
} | ||
|
||
@Test | ||
public void testFinishEmptyStream() throws Exception { | ||
ListenerForTesting l = new ListenerForTesting(); | ||
Options.Builder b = Options.builder().errorListener(l); | ||
runInJsServer(b, nc -> { | ||
JetStreamManagement jsm = nc.jetStreamManagement(); | ||
TestingStreamContainer tsc = new TestingStreamContainer(jsm); | ||
|
||
String name = variant(); | ||
|
||
ConsumerConfiguration cc = ConsumerConfiguration.builder() | ||
.name(name) | ||
.filterSubjects(tsc.subject()).build(); | ||
jsm.addOrUpdateConsumer(tsc.stream, cc); | ||
|
||
ConsumerContext cctx = nc.getConsumerContext(tsc.stream, name); | ||
|
||
MessageHandler handler = m -> { | ||
System.out.println(m); | ||
m.ack(); | ||
}; | ||
|
||
ConsumeOptions co = ConsumeOptions.builder().expiresIn(1000).build(); | ||
MessageConsumer consumer = cctx.consume(co, handler); | ||
consumer.stop(); | ||
sleep(1200); // more than the expires period for the consume | ||
assertTrue(consumer.isFinished()); | ||
}); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If a heartbeat error occurs, we would usually just try again. But if the user had called stop, they've told us that we are finished.