Improve exception handling w.r.t. IndexWriter

Certainly run close(), and do not swallow an
exception that occurs for commit() or close().

Author: idodeclare

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

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.index;
 
@@ -376,6 +377,7 @@ public void update() throws IOException, HistoryException {
             }
         }
 
+        IOException writerException = null;
         try {
             Analyzer analyzer = AnalyzerGuru.getAnalyzer();
             IndexWriterConfig iwc = new IndexWriterConfig(analyzer);
@@ -447,31 +449,43 @@ public void update() throws IOException, HistoryException {
                     reader.close();
                 }
             }
+
+            try {
+                writer.commit();
+            } catch (IOException e) {
+                writerException = e;
+                LOGGER.log(Level.WARNING,
+                    "An error occured while committing writer", e);
+            }
         } finally {
-            if (writer != null) {
-                try {
-                    writer.prepareCommit();
-                    writer.commit();
-                    writer.close();
-                } catch (IOException e) {
-                    LOGGER.log(Level.WARNING, "An error occured while closing writer", e);
+            Ctags finishingCtags = ctags;
+            ctags = null;
+
+            try {
+                if (writer != null) writer.close();
+            } catch (IOException e) {
+                if (writerException == null) writerException = e;
+                LOGGER.log(Level.WARNING,
+                    "An error occured while closing writer", e);
+            } finally {
+                writer = null;
+                synchronized (lock) {
+                    running = false;
                 }
             }
 
-            if (ctags != null) {
+            if (finishingCtags != null) {
                 try {
-                    ctags.close();
+                    finishingCtags.close();
                 } catch (IOException e) {
                     LOGGER.log(Level.WARNING,
                         "An error occured while closing ctags process", e);
                 }
             }
-
-            synchronized (lock) {
-                running = false;
-            }
         }
 
+        if (writerException != null) throw writerException;
+
         if (!isInterrupted() && isDirty()) {
             if (env.isOptimizeDatabase()) {
                 optimize();
@@ -518,15 +532,17 @@ public void run() {
     /**
      * Optimize the index database
      */
-    public void optimize() {
+    public void optimize() throws IOException {
         synchronized (lock) {
             if (running) {
                 LOGGER.warning("Optimize terminated... Someone else is updating / optimizing it!");
                 return;
             }
             running = true;
         }
+
         IndexWriter wrt = null;
+        IOException writerException = null;
         try {
             LOGGER.info("Optimizing the index ... ");
             Analyzer analyzer = new StandardAnalyzer();
@@ -544,12 +560,14 @@ public void optimize() {
                 dirty = false;
             }
         } catch (IOException e) {
+            writerException = e;
             LOGGER.log(Level.SEVERE, "ERROR: optimizing index: {0}", e);
         } finally {
             if (wrt != null) {
                 try {
                     wrt.close();
                 } catch (IOException e) {
+                    if (writerException == null) writerException = e;
                     LOGGER.log(Level.WARNING,
                         "An error occured while closing writer", e);
                 }
@@ -558,6 +576,8 @@ public void optimize() {
                 running = false;
             }
         }
+
+        if (writerException != null) throw writerException;
     }
 
     private boolean isDirty() {