ARTEMIS-4498 Making queues always manageable

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java

@@ -509,7 +509,7 @@ private Queue installMirrorController(AMQPMirrorBrokerConnectionElement replicaC
       }
 
       try {
-         server.registerQueueOnManagement(mirrorControlQueue, true);
+         server.registerQueueOnManagement(mirrorControlQueue);
       } catch (Throwable ignored) {
          logger.debug(ignored.getMessage(), ignored);
       }

artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueueFilterPredicate.java

@@ -92,6 +92,8 @@ public boolean test(QueueControl queue) {
                return matches(queue.getScheduledCount());
             case USER:
                return matches(queue.getUser());
+            case INTERNAL_QUEUE:
+               return matches(queue.isInternalQueue());
             default:
                return true;
          }

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java

@@ -989,7 +989,7 @@ Queue updateQueue(String name,
     */
    void autoRemoveAddressInfo(SimpleString address, SecurityAuth auth) throws Exception;
 
-   void registerQueueOnManagement(Queue queue, boolean registerInternal) throws Exception;
+   void registerQueueOnManagement(Queue queue) throws Exception;
 
    /**
     * Remove an {@code AddressInfo} from the broker.

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java

@@ -4000,8 +4000,8 @@ public void autoRemoveAddressInfo(SimpleString address, SecurityAuth auth) throw
 
    /** Register a queue on the management registry */
    @Override
-   public void registerQueueOnManagement(Queue queue, boolean registerInternal) throws Exception {
-      managementService.registerQueue(queue, queue.getAddress(), storageManager, registerInternal);
+   public void registerQueueOnManagement(Queue queue) throws Exception {
+      managementService.registerQueue(queue, queue.getAddress(), storageManager);
    }
 
    @Override

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java

@@ -101,8 +101,6 @@ ActiveMQServerControlImpl registerServer(PostOffice postOffice,
 
    void registerQueue(Queue queue, SimpleString address, StorageManager storageManager) throws Exception;
 
-   void registerQueue(Queue queue, SimpleString address, StorageManager storageManager, boolean forceInternal) throws Exception;
-
    void unregisterQueue(SimpleString name, SimpleString address, RoutingType routingType) throws Exception;
 
    void registerAcceptor(Acceptor acceptor, TransportConfiguration configuration) throws Exception;

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java

@@ -298,18 +298,6 @@ public synchronized void unregisterAddress(final SimpleString address) throws Ex
    public synchronized void registerQueue(final Queue queue,
                                           final AddressInfo addressInfo,
                                           final StorageManager storageManager) throws Exception {
-      registerQueue(queue, addressInfo, storageManager, false);
-   }
-
-   private synchronized void registerQueue(final Queue queue,
-                                          final AddressInfo addressInfo,
-                                          final StorageManager storageManager,
-                                          boolean forceInternal) throws Exception {
-
-      if (!forceInternal && (addressInfo.isInternal() || queue.isInternalQueue())) {
-         logger.debug("won't register internal queue: {}", queue);
-         return;
-      }
 
       QueueControlImpl queueControl = new QueueControlImpl(queue, addressInfo.getName().toString(), messagingServer, storageManager, securityStore, addressSettingsRepository);
       if (messageCounterManager != null) {
@@ -332,14 +320,6 @@ public synchronized void registerQueue(final Queue queue,
       registerQueue(queue, new AddressInfo(address), storageManager);
    }
 
-   @Override
-   public synchronized void registerQueue(final Queue queue,
-                                          final SimpleString address,
-                                          final StorageManager storageManager,
-                                          final boolean forceInternal) throws Exception {
-      registerQueue(queue, new AddressInfo(address), storageManager, forceInternal);
-   }
-
    @Override
    public synchronized void unregisterQueue(final SimpleString name, final SimpleString address, RoutingType routingType) throws Exception {
       ObjectName objectName = objectNameBuilder.getQueueObjectName(address, name, routingType);

artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java

@@ -269,11 +269,6 @@ public void registerQueue(Queue queue, SimpleString address, StorageManager stor
 
       }
 
-      @Override
-      public void registerQueue(Queue queue, SimpleString address, StorageManager storageManager, boolean forceInternal) throws Exception {
-
-      }
-
       @Override
       public void unregisterQueue(SimpleString name, SimpleString address, RoutingType routingType) throws Exception {
 

tests/compatibility-tests/src/main/resources/metrics/queueMetrics.groovy

@@ -30,6 +30,10 @@ import org.apache.activemq.artemis.api.core.management.QueueControl;
 Object[] queueControls = server.getJMSServerManager().getActiveMQServer().getManagementService().getResources(QueueControl.class);
 for (Object o : queueControls) {
     QueueControl c = (QueueControl) o;
+    if (c.isInternalQueue()) {
+        continue;
+    }
+
     GroovyRun.assertTrue(c.getPersistentSize() > 0);
     GroovyRun.assertTrue(c.getDurablePersistentSize() > 0);
     GroovyRun.assertEquals(33l, c.getMessageCount());

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java

@@ -3479,7 +3479,7 @@ public void testListQueues() throws Exception {
       Assert.assertTrue(array.getJsonObject(1).getString("name").contains("my_queue"));
 
       //test with an empty filter
-      filterString = createJsonFilter("", "", "");
+      filterString = createJsonFilter("internalQueue", "NOT_CONTAINS", "true");
 
       queuesAsJsonString = serverControl.listQueues(filterString, 1, 50);
 
@@ -3727,8 +3727,8 @@ public void testListQueuesNumericFilter() throws Exception {
 
          queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
          array = (JsonArray) queuesAsJsonObject.get("data");
-         Assert.assertEquals("number of queues returned from LESS_THAN query", 1, array.size());
-         Assert.assertEquals("correct queue returned from query", queueName4.toString(), array.getJsonObject(0).getString("name"));
+         Assert.assertEquals("number of queues returned from LESS_THAN query", 2, array.size());
+         Assert.assertEquals("correct queue returned from query", queueName4.toString(), array.getJsonObject(1).getString("name"));
 
          //test with GREATER_THAN returns 2 queue
          filterString = createJsonFilter("CONSUMER_COUNT", "GREATER_THAN", "2");

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/QueueConfigPersistenceTest.java

@@ -69,7 +69,7 @@ public void testInternalQueue() throws Exception {
       server.start();
       Queue queue = server.locateQueue(getName());
       Assert.assertTrue(queue.isInternalQueue());
-      Assert.assertNull(server.getManagementService().getResource(ResourceNames.QUEUE + getName()));
+      Assert.assertNotNull(server.getManagementService().getResource(ResourceNames.QUEUE + getName()));
 
       server.stop();
    }