Skip to content

ARTEMIS-6179 Fix deleteReference/depage deadlock #6607

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
clebertsuconic wants to merge 1 commit into
base: main
Choose a base branch
from
+230 −99
Open

ARTEMIS-6179 Fix deleteReference/depage deadlock #6607

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
4 changes: 2 additions & 2 deletions artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2077,7 +2077,7 @@ private int iterQueue(final String operationName,
try {
Transaction tx = new TransactionImpl(storageManager);

synchronized (this) {
synchronized (QueueImpl.this) {
// ensure all messages are moved from intermediateMessageReferences so that they can be seen by the iterator
doInternalPoll();

Expand Down Expand Up @@ -2223,7 +2223,7 @@ public void destroyPaging() throws Exception {
}

@Override
public synchronized boolean deleteReference(final long messageID) throws Exception {
public boolean deleteReference(final long messageID) throws Exception {
return iterQueue("deleteReference", DEFAULT_FLUSH_LIMIT, null, new QueueIterateAction(messageID) {
@Override
public boolean actMessage(Transaction tx, MessageReference ref) throws Exception {
Expand Down
Loading
Loading