ARTEMIS-2057 Fix runaway credit grants #2272
Merged
Conversation
This file contains 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
gemmellr
reviewed
Aug 28, 2018
| if (receiver.getRemoteCredit() <= threshold) { | ||
| receiver.flow(credits); | ||
| if (receiver.getCredit() <= threshold) { | ||
| receiver.flow(credits - receiver.getCredit()); |
There was a problem hiding this comment.
I think this should protect against trying to flow <=0 after the calculation.
| * Test that the AMQPSessionCallback grants no credit when not at threshold | ||
| */ | ||
| @Test | ||
| public void testOfferProducerWithNoAddressDoesNMotTopOffCreditAboveThresholdN() { |
There was a problem hiding this comment.
Typos in name testOfferProducerWithNoAddressDoesNMotTopOffCreditAboveThresholdN
| AMQPSessionCallback session = new AMQPSessionCallback( | ||
| protonSPI, manager, connection, transportConnection, executor, operationContext); | ||
|
|
||
| // Credit is below threshold |
| assertNotNull(argument.getValue()); | ||
| argument.getValue().run(); | ||
|
|
||
| // Credit runnable should top off credit to configured value |
| * Test that the AMQPSessionCallback grants no credit when not at threshold | ||
| */ | ||
| @Test | ||
| public void testOfferProducerWithAddressDoesNMotTopOffCreditAboveThresholdN() throws Exception { |
tabish121
force-pushed
the
ARTEMIS-2057
branch
from
480e41c
to
5730deb
Compare
|
@gemmellr I've pushed some updates based on comments, thanks for reviewing |
tabish121
force-pushed
the
ARTEMIS-2057
branch
from
5730deb
to
1e8abbe
Compare
Ensure the broker looks at local receiver credit when checking for credit top off threshold and then do a proper top off back to the high water mark to sync with how client receivers manage their credit.
tabish121
force-pushed
the
ARTEMIS-2057
branch
from
1e8abbe
to
3425409
Compare
asfgit
pushed a commit
that referenced
this pull request
Aug 28, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Ensure the broker looks at local receiver credit when checking for
credit top off threshold and then do a proper top off back to the high
water mark to sync with how client receivers manage their credit.