svn commit: r1866895 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java

[ro...@apache.org]

Author: rombert
Date: Fri Sep 13 11:04:05 2019
New Revision: 1866895

URL: http://svn.apache.org/viewvc?rev=1866895&view=rev
Log:
OAK-8530 - Ensure MBean are deregistered if the repository fails to start

- register all closables with the closer
- ensure that if repository startup fails the closer is closed, and
  therefore all registered closables.
    
Closes #140

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1866895&r1=1866894&r2=1866895&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Fri Sep 13 11:04:05 2019
@@ -62,6 +62,7 @@ import org.apache.jackrabbit.oak.api.Des
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.jmx.QueryEngineSettingsMBean;
 import org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean;
+import org.apache.jackrabbit.oak.commons.IOUtils;
 import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
 import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
 import org.apache.jackrabbit.oak.core.ContentRepositoryImpl;
@@ -668,7 +669,12 @@ public class Oak {
      */
     public ContentRepository createContentRepository() {
         if (contentRepository == null) {
-            contentRepository = createNewContentRepository();
+            try {
+                contentRepository = createNewContentRepository();
+            } catch ( RuntimeException e ) {
+                IOUtils.closeQuietly(closer);
+                throw e;
+            }
         }
 
         return contentRepository;
@@ -713,7 +719,9 @@ public class Oak {
         }
 
         final RepoStateCheckHook repoStateCheckHook = new RepoStateCheckHook();
+        closer.register(repoStateCheckHook);
         final List<Registration> regs = Lists.newArrayList();
+        closer.register( () -> new CompositeRegistration(regs).unregister() );
         regs.add(whiteboard.register(Executor.class, getExecutor(), Collections.emptyMap()));
 
         IndexEditorProvider indexEditors = CompositeIndexEditorProvider.compose(indexEditorProviders);
@@ -788,8 +796,6 @@ public class Oak {
             @Override
             public void close() throws IOException {
                 super.close();
-                repoStateCheckHook.close();
-                new CompositeRegistration(regs).unregister();
                 closer.close();
             }
         };