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

This closes #3033

This commit is contained in:
Justin Bertram 2020-05-01 13:13:45 -05:00
parent 4ca6bac92d 0b155cf5ea
commit 75a5b7525d
5 changed files with 107 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
View File

@ -2324,4 +2324,21 @@ public interface AuditLogger extends BasicLogger {
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601508, value = "User {0} is getting group first key on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void getGroupFirstKey(String user, Object source, Object... args);
static void getCurrentDuplicateIdCacheSize(Object source) {
LOGGER.getCurrentDuplicateIdCacheSize(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601509, value = "User {0} is getting currentDuplicateIdCacheSize property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void getCurrentDuplicateIdCacheSize(String user, Object source, Object... args);
static void clearDuplicateIdCache(Object source) {
LOGGER.clearDuplicateIdCache(getCaller(), source);
}
@LogMessage(level = Logger.Level.INFO)
@Message(id = 601510, value = "User {0} is clearing duplicate ID cache on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
void clearDuplicateIdCache(String user, Object source, Object... args);
}

6
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
View File

@ -165,4 +165,10 @@ public interface AddressControl {
@Attribute(desc = "whether this address is used for a retroactive address")
boolean isRetroactiveResource();
@Attribute(desc = "the size of the duplicate ID cache for this address")
long getCurrentDuplicateIdCacheSize();
@Attribute(desc = "clear the duplicate ID cache for this address both from memory and from the journal")
boolean clearDuplicateIdCache() throws Exception;
}

38
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
View File

@ -35,11 +35,14 @@ import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.Bindings;
import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache;
import org.apache.activemq.artemis.core.postoffice.QueueBinding;
import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl;
import org.apache.activemq.artemis.core.security.CheckType;
import org.apache.activemq.artemis.core.security.Role;
import org.apache.activemq.artemis.core.security.SecurityStore;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.management.ManagementService;
import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
@ -427,6 +430,41 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
return ResourceNames.isRetroactiveResource(server.getInternalNamingPrefix(), addressInfo.getName());
}
@Override
public long getCurrentDuplicateIdCacheSize() {
if (AuditLogger.isEnabled()) {
AuditLogger.getCurrentDuplicateIdCacheSize(this.addressInfo);
}
DuplicateIDCache cache = ((PostOfficeImpl)server.getPostOffice()).getDuplicateIDCaches().get(addressInfo.getName());
try {
if (cache != null) {
return cache.getMap().size();
}
} catch (Exception e) {
ActiveMQServerLogger.LOGGER.debug("Failed to get duplicate ID cache size", e);
}
return 0;
}
@Override
public boolean clearDuplicateIdCache() {
if (AuditLogger.isEnabled()) {
AuditLogger.clearDuplicateIdCache(this.addressInfo);
}
DuplicateIDCache cache = ((PostOfficeImpl)server.getPostOffice()).getDuplicateIDCaches().get(addressInfo.getName());
try {
if (cache != null) {
cache.clear();
return true;
}
} catch (Exception e) {
ActiveMQServerLogger.LOGGER.debug("Failed to clear duplicate ID cache", e);
}
return false;
}
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------

36
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
View File

@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import org.apache.activemq.artemis.api.core.JsonUtil;
import org.apache.activemq.artemis.api.core.Message;
@ -432,6 +433,41 @@ public class AddressControlTest extends ManagementTestBase {
assertEquals("myValue2", message.getStringProperty("myProp2"));
}
@Test
public void testGetCurrentDuplicateIdCacheSize() throws Exception {
internalDuplicateIdTest(false);
}
@Test
public void testClearDuplicateIdCache() throws Exception {
internalDuplicateIdTest(true);
}
private void internalDuplicateIdTest(boolean clear) throws Exception {
server.getConfiguration().setPersistIDCache(false);
SimpleString address = RandomUtil.randomSimpleString();
session.createAddress(address, RoutingType.ANYCAST, false);
AddressControl addressControl = createManagementControl(address);
Assert.assertEquals(0, addressControl.getQueueNames().length);
session.createQueue(address, RoutingType.ANYCAST, address);
Assert.assertEquals(1, addressControl.getQueueNames().length);
Map<String, String> headers = new HashMap<>();
headers.put(Message.HDR_DUPLICATE_DETECTION_ID.toString(), UUID.randomUUID().toString());
addressControl.sendMessage(headers, Message.BYTES_TYPE, Base64.encodeBytes("test".getBytes()), false, null, null);
addressControl.sendMessage(headers, Message.BYTES_TYPE, Base64.encodeBytes("test".getBytes()), false, null, null);
headers.clear();
headers.put(Message.HDR_DUPLICATE_DETECTION_ID.toString(), UUID.randomUUID().toString());
addressControl.sendMessage(headers, Message.BYTES_TYPE, Base64.encodeBytes("test".getBytes()), false, null, null);
Wait.assertTrue(() -> addressControl.getCurrentDuplicateIdCacheSize() == 2);
if (clear) {
assertTrue(addressControl.clearDuplicateIdCache());
Wait.assertTrue(() -> addressControl.getCurrentDuplicateIdCacheSize() == 0);
}
}
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------

10
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
View File

@ -138,6 +138,16 @@ public class AddressControlUsingCoreTest extends AddressControlTest {
return (boolean) proxy.retrieveAttributeValue("retroactiveResource");
}
@Override
public long getCurrentDuplicateIdCacheSize() {
return (long) proxy.retrieveAttributeValue("currentDuplicateIdCacheSize");
}
@Override
public boolean clearDuplicateIdCache() throws Exception {
return (boolean) proxy.invokeOperation("clearDuplicateIdCache");
}
@Override
public String sendMessage(Map<String, String> headers,
int type,