[
https://issues.apache.org/jira/browse/ARTEMIS-3720?focusedWorklogId=742513&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-742513
]
ASF GitHub Bot logged work on ARTEMIS-3720:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 16/Mar/22 16:38
Start Date: 16/Mar/22 16:38
Worklog Time Spent: 10m
Work Description: gemmellr commented on a change in pull request #3983:
URL: https://github.com/apache/activemq-artemis/pull/3983#discussion_r826052533
##########
File path:
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingManager.java
##########
@@ -99,7 +99,12 @@
* Add size at the global count level.
* if totalSize > globalMaxSize it will return true
*/
- PagingManager addSize(int size);
+ PagingManager addSize(int size, boolean sizeOnly);
Review comment:
The javadoc wasnt changed (though already clearly doenst match the
method) when adding the arg, and its entirely unclear here what the 'size only'
arg does during 'addSize'.
##########
File path:
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
##########
@@ -0,0 +1,304 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.utils;
+
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import java.util.function.IntConsumer;
+
+import org.jboss.logging.Logger;
+
+public class SizeAwareMetric {
+
+ private static final Logger logger =
Logger.getLogger(SizeAwareMetric.class);
+
+ private static final AtomicLongFieldUpdater<SizeAwareMetric>
elementsUpdater = AtomicLongFieldUpdater.newUpdater(SizeAwareMetric.class,
"elements");
+ private volatile long elements;
+
+ private static final AtomicLongFieldUpdater<SizeAwareMetric> sizeUpdater =
AtomicLongFieldUpdater.newUpdater(SizeAwareMetric.class, "size");
+
+ private volatile long size;
+
+ private static final int FREE = 0, OVER_SIZE = 1, OVER_ELEMENTS = 2,
NOT_USED = -1;
+
+ private static final AtomicIntegerFieldUpdater<SizeAwareMetric> flagUpdater
= AtomicIntegerFieldUpdater.newUpdater(SizeAwareMetric.class, "flag");
+ private volatile int flag = NOT_USED;
+
+ public boolean isOver() {
+ return flag != FREE && flag != NOT_USED;
+ }
+
+ public boolean isOverSize() {
+ return flag == OVER_SIZE;
+ }
+
+ public boolean isOverElements() {
+ return flag == OVER_ELEMENTS;
+ }
+
+
+ private long maxElements;
+
+ private long lowerMarkElements;
+
+ private long maxSize;
+
+ private long lowerMark;
+
+ private boolean sizeEnabled = false;
+
+ private boolean elementsEnabled = false;
+
+ private SizeAwareMetric[] parentSlots;
+
+ private IntConsumer[] onSizeSlots;
+
+ private IntConsumer[] onSizeOnlySlots;
+
+ private Runnable[] overSlots;
+
+ private Runnable[] underSlots;
+
+ public long getSize() {
+ return size;
+ }
+
+ public boolean isElementsEnabled() {
+ return elementsEnabled;
+ }
+
+ public SizeAwareMetric setElementsEnabled(boolean elementsEnabled) {
+ this.elementsEnabled = elementsEnabled;
+ return this;
+ }
+
+ public long getElements() {
+ return elements;
+ }
+
+ public boolean isSizeEnabled() {
+ return sizeEnabled;
+ }
+
+ public SizeAwareMetric setSizeEnabled(boolean sizeEnabled) {
+ this.sizeEnabled = sizeEnabled;
+ return this;
+ }
+
+ public void addOnSizeCallback(IntConsumer onSize, boolean sizeOnly) {
+
+ IntConsumer[] slots = sizeOnly ? onSizeOnlySlots : onSizeSlots;
+
+ for (int i = 0; i < slots.length; i++) {
+ if (slots[i] == null) {
+ slots[i] = onSize;
+ return;
+ }
+ }
+
+ throw new IllegalStateException("no open slot available");
+ }
+
+ public void addOverCallback(Runnable over) {
+ for (int i = 0; i < overSlots.length; i++) {
+ if (overSlots[i] == null) {
+ overSlots[i] = over;
+ return;
+ }
+ }
+
+ throw new IllegalStateException("no open slot available");
+ }
+
+ public void addParent(SizeAwareMetric parent) {
+ for (int i = 0; i < parentSlots.length; i++) {
+ if (parentSlots[i] == null) {
+ parentSlots[i] = parent;
+ return;
+ }
+ }
+
+ throw new IllegalStateException("no open slot available");
+ }
+
+
+ public void addUnderCallback(Runnable under) {
+ for (int i = 0; i < underSlots.length; i++) {
+ if (underSlots[i] == null) {
+ underSlots[i] = under;
+ return;
+ }
+ }
+
+ throw new IllegalStateException("no open slot available");
+ }
+
+ public SizeAwareMetric(long maxSize, long lowerMark, long maxElements, long
lowerMarkElements, SizeAwareMetric[] parentSlots, IntConsumer[] onSizeSlots,
IntConsumer[] onSizeOnlySlots, Runnable[] overSlots, Runnable[] underSlots) {
+ if (lowerMark > maxSize) {
+ throw new IllegalArgumentException("lowerMark must be <= maxSize");
+ }
+ this.maxElements = maxElements;
+ this.lowerMarkElements = lowerMarkElements;
+ this.maxSize = maxSize;
+ this.lowerMark = lowerMark;
+ this.onSizeSlots = onSizeSlots;
+ this.parentSlots = parentSlots;
+ this.onSizeOnlySlots = onSizeOnlySlots;
+ this.overSlots = overSlots;
+ this.underSlots = underSlots;
+ this.sizeEnabled = maxSize >= 0;
+ this.elementsEnabled = maxElements >= 0;
+ }
+
+ public SizeAwareMetric(long maxSize, long lowerMark, long maxElements, long
lowerMarkElements, int parentSlots, int onSizeSlotNumber, int
onSizeOnlySlotNumber, int overSlotNumber, int underSlotNumber) {
+ this (maxSize, lowerMark, maxElements,
+ lowerMarkElements,
+ parentSlots > 0 ? new SizeAwareMetric[parentSlots] : null,
+ onSizeSlotNumber > 0 ? new IntConsumer[onSizeSlotNumber] : null,
+ onSizeOnlySlotNumber > 0 ? new IntConsumer[onSizeOnlySlotNumber] :
null,
+ overSlotNumber > 0 ? new Runnable[overSlotNumber] : null,
+ underSlotNumber > 0 ? new Runnable[underSlotNumber] : null);
+ }
+
+ protected void over() {
+ if (overSlots != null) {
+ for (Runnable over: overSlots) {
+ if (over != null) {
+ try {
+ over.run();
+ } catch (Throwable e) {
+ logger.warn(e.getMessage(), e);
+ }
+ }
+ }
+ }
+ }
+
+ protected void under() {
+ if (underSlots != null) {
+ for (Runnable under: underSlots) {
+ if (under != null) {
+ try {
+ under.run();
+ } catch (Throwable e) {
+ logger.warn(e.getMessage(), e);
+ }
+ }
+ }
+ }
+ }
+
+ private boolean changeFlag(int expected, int newValue) {
+ return flagUpdater.compareAndSet(this, expected, newValue);
+ }
+
+ public long addSize(int delta) {
+ return addSize(delta, false);
+ }
+
+ public long addSize(int delta, boolean sizeOnly) {
+
+ if (delta == 0) {
+ logger.debug("SizeAwareMetric ignored with size 0", new
Exception("trace"));
Review comment:
How likely is this (I'm surprised to see it at all)? If likely, perhaps
an isDebugEnabled check to avoid the Exception creation cost?
##########
File path:
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
##########
@@ -189,13 +198,45 @@ public PagingStoreImpl(final SimpleString address,
this.usingGlobalMaxSize = pagingManager.isUsingGlobalSize();
}
+ private static SizeAwareMetric getGlobalMetric(PagingManager manager) {
+ if (manager instanceof PagingManagerImpl) {
+ return ((PagingManagerImpl) manager).getSizeAwareMetric();
+ } else {
+ // for unit / mock tests
+ SizeAwareMetric metric = new SizeAwareMetric(-1, -1, -1, -1, -1, 1,
1, 0, 0);
+ metric.addOnSizeCallback(manager::addSize, false);
+ metric.addOnSizeCallback((l) -> manager.addSize(l, true), true);
+ return metric;
+ }
+ }
Review comment:
This seems horrible. Nothing less ugly could that be done [in the tests]
for the testing needs? Is the casting needed in the first case?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 742513)
Time Spent: 2.5h (was: 2h 20m)
> Max number of messages as a deciding factor for Paging
> ------------------------------------------------------
>
> Key: ARTEMIS-3720
> URL: https://issues.apache.org/jira/browse/ARTEMIS-3720
> Project: ActiveMQ Artemis
> Issue Type: Improvement
> Components: Broker
> Reporter: Clebert Suconic
> Assignee: Clebert Suconic
> Priority: Major
> Fix For: 2.21.0
>
> Time Spent: 2.5h
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
