svn commit: r1809116 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexerMBeanImpl.java

[chetanm]

Author: chetanm
Date: Thu Sep 21 04:39:07 2017
New Revision: 1809116

URL: http://svn.apache.org/viewvc?rev=1809116&view=rev
Log:
OAK-6692 - Log exception in case of import via JMX operation fails

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexerMBeanImpl.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexerMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexerMBeanImpl.java?rev=1809116&r1=1809115&r2=1809116&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexerMBeanImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexerMBeanImpl.java
 Thu Sep 21 04:39:07 2017
@@ -41,11 +41,14 @@ import org.apache.jackrabbit.oak.spi.whi
 import org.apache.jackrabbit.oak.spi.whiteboard.Tracker;
 import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
 import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static 
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
 
 @Component
 public class IndexerMBeanImpl extends AnnotatedStandardMBean implements 
IndexerMBean {
+    private final Logger log = LoggerFactory.getLogger(getClass());
     @Reference
     private NodeStore nodeStore;
 
@@ -62,9 +65,14 @@ public class IndexerMBeanImpl extends An
 
     @Override
     public boolean importIndex(String indexDirPath) throws IOException, 
CommitFailedException {
-        IndexImporter importer = new IndexImporter(nodeStore, new 
File(indexDirPath), editorProvider, createLock());
-        providerTracker.getServices().forEach(importer::addImporterProvider);
-        importer.importIndex();
+        try {
+            IndexImporter importer = new IndexImporter(nodeStore, new 
File(indexDirPath), editorProvider, createLock());
+            
providerTracker.getServices().forEach(importer::addImporterProvider);
+            importer.importIndex();
+        } catch (IOException | CommitFailedException | RuntimeException e) {
+            log.warn("Error occurred while importing index from path [{}]", 
indexDirPath, e);
+            throw e;
+        }
         return true;
     }