#4212 Fix shards stuck in opening state

Author: stroomdev66

stroom-index/stroom-index-lucene553/src/main/java/stroom/index/lucene553/IndexShardSearcher.java

@@ -23,6 +23,7 @@
 import stroom.util.io.FileUtil;
 import stroom.util.io.PathCreator;
 
+import org.apache.lucene553.index.CorruptIndexException;
 import org.apache.lucene553.index.IndexWriter;
 import org.apache.lucene553.search.IndexSearcher;
 import org.apache.lucene553.search.SearcherFactory;
@@ -111,8 +112,12 @@ class IndexShardSearcher {
                     searcherManager.release(indexSearcher);
                 }
             }
+        } catch (final CorruptIndexException e) {
+            throw new SearchException("Corrupt index shard (id=" + indexShard.getId() + "). " + e.getMessage(),
+                    e);
         } catch (final IOException e) {
-            throw new SearchException(e.getMessage(), e);
+            throw new SearchException("Error reading index shard (id=" + indexShard.getId() + "). " + e.getMessage(),
+                    e);
         }
 
         this.directory = directory;

stroom-index/stroom-index-lucene980/src/main/java/stroom/index/lucene980/IndexShardSearcher.java

@@ -23,6 +23,7 @@
 import stroom.util.io.FileUtil;
 import stroom.util.io.PathCreator;
 
+import org.apache.lucene980.index.CorruptIndexException;
 import org.apache.lucene980.index.IndexWriter;
 import org.apache.lucene980.search.IndexSearcher;
 import org.apache.lucene980.search.SearcherFactory;
@@ -111,8 +112,12 @@ class IndexShardSearcher {
                     searcherManager.release(indexSearcher);
                 }
             }
+        } catch (final CorruptIndexException e) {
+            throw new SearchException("Corrupt index shard (id=" + indexShard.getId() + "). " + e.getMessage(),
+                    e);
         } catch (final IOException e) {
-            throw new SearchException(e.getMessage(), e);
+            throw new SearchException("Error reading index shard (id=" + indexShard.getId() + "). " + e.getMessage(),
+                    e);
         }
 
         this.directory = directory;