Remove schedExecutor after reversions. Add log message.

Author: idodeclare

src/org/opensolaris/opengrok/index/IndexDatabase.java

@@ -441,7 +441,7 @@ public void update(IndexerParallelizer parallelizer)
                         }
                     }
 
-                    // The actual indexing happens in indexDown().
+                    // The actual indexing happens in indexParallel().
 
                     IndexDownArgs args = new IndexDownArgs();
                     args.est_total = getFileCount(sourceRoot, dir);
@@ -1012,6 +1012,7 @@ private void indexParallel(IndexDownArgs args) throws IOException {
                         } catch (InterruptedException e) {
                             // Allow one retry if interrupted
                             if (++tries <= 1) continue;
+                            LOGGER.log(Level.WARNING, "No retry: {0}", x.file);
                             x.exception = e;
                             ret = false;
                         } catch (RuntimeException|IOException e) {

src/org/opensolaris/opengrok/index/IndexerParallelizer.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.logging.Logger;
 import org.opensolaris.opengrok.analysis.Ctags;
 import org.opensolaris.opengrok.analysis.CtagsValidator;
@@ -47,14 +46,11 @@
  */
 public class IndexerParallelizer implements AutoCloseable {
 
-    private static final int SCHED_THREAD_NUM = 2;
-
     private static final Logger LOGGER =
         LoggerFactory.getLogger(IndexerParallelizer.class);
 
     private final ExecutorService fixedExecutor;
     private final ForkJoinPool forkJoinPool;
-    private final ScheduledThreadPoolExecutor schedExecutor;
     private final ObjectPool<Ctags> ctagsPool;
 
     /**
@@ -69,7 +65,6 @@ public IndexerParallelizer(RuntimeEnvironment env) {
         // The order of the following is important.
         this.fixedExecutor = Executors.newFixedThreadPool(indexingParallelism);
         this.forkJoinPool = new ForkJoinPool(indexingParallelism);
-        this.schedExecutor = new ScheduledThreadPoolExecutor(SCHED_THREAD_NUM);
         this.ctagsPool = new BoundedBlockingObjectPool<>(indexingParallelism,
             new CtagsValidator(), new CtagsObjectFactory(env));
     }
@@ -98,7 +93,6 @@ public ObjectPool<Ctags> getCtagsPool() {
     @Override
     public void close() throws Exception {
         if (ctagsPool != null) ctagsPool.shutdown();
-        if (schedExecutor != null) schedExecutor.shutdown();
         if (forkJoinPool != null) forkJoinPool.shutdown();
         if (fixedExecutor != null) fixedExecutor.shutdown();
     }