Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-4073 Relaxing some locks that were not necessary and were causing dead locks on the testsuite

This commit is contained in:
Clebert Suconic 2022-10-26 04:44:20 -04:00 committed by clebertsuconic
parent d185735e55
commit 0da14a303d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
View File

@ -185,7 +185,7 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter {
} }
@Override @Override
public synchronized void increment(Transaction tx, int add, long size) throws Exception { public void increment(Transaction tx, int add, long size) throws Exception {
if (tx == null) { if (tx == null) {
if (persistent) { if (persistent) {
long id = storage.storePageCounterInc(this.subscriptionID, add, size); long id = storage.storePageCounterInc(this.subscriptionID, add, size);
@ -316,7 +316,7 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter {
} }
// you need to call this method from the executors when id > 0 // you need to call this method from the executors when id > 0
private synchronized void doIncrement(long id, int variance, long size) { private void doIncrement(long id, int variance, long size) {
value.addAndGet(variance); value.addAndGet(variance);
this.persistentSize.addAndGet(size); this.persistentSize.addAndGet(size);
if (variance > 0) { if (variance > 0) {
@ -326,9 +326,11 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter {
addedPersistentSize.addAndGet(size); addedPersistentSize.addAndGet(size);
} }
if (id >= 0) { if (id >= 0) {
incrementRecords.add(id); synchronized (this) {
if (incrementRecords.size() > FLUSH_COUNTER) { incrementRecords.add(id);
this.cleanup(); if (incrementRecords.size() > FLUSH_COUNTER) {
this.cleanup();
}
} }
} }
} }