Merge branch 'develop' into feature/multivalued-hierarchical-facets

Author: joewiz

exist-core/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.10.1</version>
+            <version>2.10.2</version>
         </dependency>
 
         <!-- dependency>
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.lz4</groupId>
             <artifactId>lz4-java</artifactId>
-            <version>1.7.0</version>
+            <version>1.7.1</version>
         </dependency>
 
         <dependency>
@@ -169,7 +169,7 @@
         <dependency>
             <groupId>org.jline</groupId>
             <artifactId>jline</artifactId>
-            <version>3.13.2</version>
+            <version>3.13.3</version>
         </dependency>
 
         <dependency>
@@ -250,7 +250,7 @@
         <dependency>
             <groupId>org.exist-db.thirdparty.xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.0</version>
+            <version>2.12.1</version>
             <classifier>xml-schema-1.1</classifier>
         </dependency>
 

exist-core/src/main/java/org/exist/management/AgentFactory.java

@@ -21,6 +21,7 @@
  */
 package org.exist.management;
 
+import net.jcip.annotations.ThreadSafe;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -29,13 +30,14 @@
 
 import static java.lang.invoke.MethodType.methodType;
 
+@ThreadSafe
 public class AgentFactory {
 
     private final static Logger LOG = LogManager.getLogger(AgentFactory.class);
 
     private static Agent instance = null;
 
-    public static Agent getInstance() {
+    public static synchronized Agent getInstance() {
         if (instance == null) {
             final String className = System.getProperty("exist.jmxagent", "org.exist.management.impl.JMXAgent");
             try {
@@ -48,7 +50,7 @@ public static Agent getInstance() {
                     // 1. try for default constructor
                     try {
                         final MethodHandle mhConstructor = lookup.findConstructor(clazz, methodType(void.class));
-                        instance = (Agent) mhConstructor.invokeExact();
+                        instance = (Agent) mhConstructor.invoke();
                     } catch (final NoSuchMethodException | IllegalAccessException e) {
                         LOG.warn("No default constructor found for Agent: " + className + ". Will try singleton pattern...");
 

exist-core/src/main/java/org/exist/management/impl/JMXAgent.java

@@ -41,21 +41,19 @@
 /**
  * Real implementation of interface {@link org.exist.management.Agent}
  * which registers MBeans with the MBeanServer.
+ *
+ * Note that the agent will be constructed via reflection by the
+ * {@link org.exist.management.AgentFactory}
  */
-public class JMXAgent implements Agent {
+public final class JMXAgent implements Agent {
 
     private static final Logger LOG = LogManager.getLogger(JMXAgent.class);
-    private static final JMXAgent instance = new JMXAgent();
 
     private final MBeanServer server;
     private final Map<String, Deque<ObjectName>> registeredMBeans = new HashMap<>();
     private final Map<ObjectName, Object> beanInstances = new HashMap<>();
 
-    public static Agent getInstance() {
-        return instance;
-    }
-
-    private JMXAgent() {
+    public JMXAgent() {
         if (LOG.isDebugEnabled()) {
             LOG.debug("Creating the JMX MBeanServer.");
         }
@@ -67,13 +65,6 @@ private JMXAgent() {
             server = MBeanServerFactory.createMBeanServer();
         }
 
-//        try {
-//            JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://127.0.0.1:9999/server");
-//            JMXConnectorServer cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null, server);
-//            cs.start();
-//        } catch (IOException e) {
-//            LOG.warn("ERROR: failed to initialize JMX connector: " + e.getMessage(), e);
-//        }
         registerSystemMBeans();
     }
 
@@ -108,19 +99,14 @@ public synchronized void initDBInstance(final BrokerPool instance) {
 
     @Override
     public synchronized void closeDBInstance(final BrokerPool instance) {
-        try {
-            final Deque<ObjectName> stack = registeredMBeans.get(instance.getId());
-            while (!stack.isEmpty()) {
-                final ObjectName on = stack.pop();
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("Unregistering JMX MBean: " + on);
-                }
-                if (server.isRegistered(on)) {
-                    server.unregisterMBean(on);
-                }
+        final Deque<ObjectName> stack = registeredMBeans.get(instance.getId());
+        while (!stack.isEmpty()) {
+            final ObjectName on = stack.pop();
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("deregistering JMX MBean: " + on);
             }
-        } catch (final InstanceNotFoundException | MBeanRegistrationException e) {
-            LOG.warn("Problem found while unregistering JMX", e);
+            beanInstances.remove(on);
+            removeMBean(on);
         }
     }
 
@@ -155,6 +141,16 @@ private void addMBean(final ObjectName name, final Object mbean) throws Database
         }
     }
 
+    private void removeMBean(final ObjectName name) {
+        try {
+            if (server.isRegistered(name)) {
+                server.unregisterMBean(name);
+            }
+        } catch (final InstanceNotFoundException | MBeanRegistrationException  e) {
+            LOG.warn("Problem unregistering mbean: " + e.getMessage(), e);
+        }
+    }
+
     @Override
     public synchronized void changeStatus(final BrokerPool instance, final TaskStatus actualStatus) {
         try {

exist-core/src/main/java/org/exist/storage/BrokerPool.java

@@ -1688,6 +1688,9 @@ void shutdown(final boolean killed, final Consumer<String> shutdownInstanceConsu
                     // final notification to database services to shutdown
                     servicesManager.shutdown();
 
+                    // remove all remaining inactive brokers as we have shutdown now and no longer need those
+                    inactiveBrokers.clear();
+
                     // deregister JMX MBeans
                     AgentFactory.getInstance().closeDBInstance(this);
 
@@ -1732,7 +1735,7 @@ void shutdown(final boolean killed, final Consumer<String> shutdownInstanceConsu
 
                 notificationService = null;
                 statusObservers.clear();
-
+                startupTriggersManager = null;
                 statusReporter.terminate();
                 statusReporter = null;
 

exist-core/src/main/java/org/exist/storage/BrokerPoolServicesManager.java

@@ -297,5 +297,7 @@ void shutdown() {
             }
             brokerPoolService.shutdown();
         }
+
+        brokerPoolServices.clear();
     }
 }

exist-core/src/main/java/org/exist/storage/ContentLoadingObserver.java

@@ -108,7 +108,7 @@ public interface ContentLoadingObserver extends AutoCloseable {
 	@Override
 	void close() throws DBException;
 
-	void closeAndRemove();
+	void closeAndRemove() throws DBException;
 
 	void printStatistics();
 

exist-core/src/main/java/org/exist/storage/DefaultCacheManager.java

@@ -33,6 +33,7 @@
 import java.text.NumberFormat;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 
@@ -172,13 +173,10 @@ public void registerCache( Cache cache )
     @Override
     public void deregisterCache( Cache cache )
     {
-        Cache next;
-
-        for( int i = 0; i < caches.size(); i++ ) {
-            next = (Cache)caches.get( i );
-
-            if( cache == next ) {
-                caches.remove( i );
+        for (final Iterator<Cache> cacheIt = caches.iterator(); cacheIt.hasNext(); ) {
+            if (cache == cacheIt.next()) {
+                cache.setCacheManager( null );
+                cacheIt.remove();
                 break;
             }
         }

exist-core/src/main/java/org/exist/storage/NativeBroker.java

@@ -333,7 +333,7 @@ private void notifyClose() throws DBException {
         clearContentLoadingObservers();
     }
 
-    private void notifyCloseAndRemove() {
+    private void notifyCloseAndRemove() throws DBException {
         for(final ContentLoadingObserver observer : contentLoadingObservers) {
             observer.closeAndRemove();
         }
@@ -3626,8 +3626,8 @@ public void repair() throws PermissionDeniedException, IOException, LockExceptio
         }
 
         LOG.info("Removing index files ...");
-        notifyCloseAndRemove();
         try {
+            notifyCloseAndRemove();
             pool.getIndexManager().removeIndexes();
         } catch(final DBException e) {
             LOG.error("Failed to remove index files during repair: " + e.getMessage(), e);

exist-core/src/main/java/org/exist/storage/NativeValueIndex.java

@@ -1048,7 +1048,7 @@ private AtomicValue convertToAtomic(final int xpathType, final String value) {
     }
 
     @Override
-    public void closeAndRemove() {
+    public void closeAndRemove() throws DBException {
         try(final ManagedLock<ReentrantLock> bfileLock = lockManager.acquireBtreeWriteLock(dbValues.getLockName())) {
             config.setProperty(getConfigKeyForFile(), null);
             dbValues.closeAndRemove();

exist-core/src/main/java/org/exist/storage/btree/BTree.java

@@ -217,12 +217,6 @@ public boolean open(final short expectedVersion) throws DBException {
         }
     }
 
-    @Override
-    public void closeAndRemove() {
-        super.closeAndRemove();
-        cacheManager.deregisterCache(cache);
-    }
-
     @Override
     public String getLockName() {
         return null;
@@ -547,6 +541,7 @@ public void close() throws DBException {
             flush();
         }
         super.close();
+        cacheManager.deregisterCache(cache);
     }
 
     protected void dumpValue(final Writer writer, final Value value, final int status) throws IOException {