ARTEMIS-4768 _AMQ_SCHED_DELIVERY msg prop lost after broker restart #4929
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
| @@ -243,10 +243,6 @@ public void handleAddMessage(Map<Long, Map<Long, AddMessageRecord>> queueMap) th | |||
| MessageReference ref = postOffice.reload(record.getMessage(), queue, null); | |||
|
|
|||
| ref.setDeliveryCount(record.getDeliveryCount()); | |||
|
|
|||
| if (scheduledDeliveryTime != 0) { | |||
| record.getMessage().setScheduledDeliveryTime(0L); | |||
There was a problem hiding this comment.
I think this was on purpose. If you are reloading it it shouldn't be scheduled.
There was a problem hiding this comment.
If you look a few lines up from the code I removed you'll see this:
if (scheduledDeliveryTime != 0) {
record.getMessage().setScheduledDeliveryTime(scheduledDeliveryTime);
}So first we set it to scheduledDeliveryTime and then we set it to 0. One of these must be wrong. I believe the one I removed in the wrong one.
There is another block still further up that does this:
if (scheduledDeliveryTime != 0 && scheduledDeliveryTime <= currentTime) {
scheduledDeliveryTime = 0;
record.getMessage().setScheduledDeliveryTime(0L);
}Reloading a message whose scheduled delivery time is already passed should not be scheduled. Is this what you were referring to?
There was a problem hiding this comment.
@clebertsuconic, can you take another look at this before 2.34.0?
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.
No description provided.