more single node bug fixes

zuliaio · Mar 23, 2022 · 6f7ea1c · 6f7ea1c
1 parent 58eee77
commit 6f7ea1c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/zulia-server/src/main/java/io/zulia/server/config/single/FSIndexService.java b/zulia-server/src/main/java/io/zulia/server/config/single/FSIndexService.java
@@ -67,7 +67,13 @@ public List<ZuliaIndex.IndexSettings> getIndexes() throws Exception {
 
 	@Override
 	public ZuliaIndex.IndexSettings getIndex(String indexName) throws Exception {
-		return getIndexSettings(new File(baseDir + File.separator + indexName + INDEX_EXTENSION));
+		File indexSettingsFile = new File(baseDir + File.separator + indexName + INDEX_EXTENSION);
+		if (indexSettingsFile.exists()) {
+			return getIndexSettings(indexSettingsFile);
+		}
+		else {
+			return null;
+		}
 	}
 
 	@Override

diff --git a/zulia-server/src/main/java/io/zulia/server/index/ZuliaIndex.java b/zulia-server/src/main/java/io/zulia/server/index/ZuliaIndex.java
@@ -27,6 +27,7 @@
 import io.zulia.server.config.IndexService;
 import io.zulia.server.config.ServerIndexConfig;
 import io.zulia.server.config.ZuliaConfig;
+import io.zulia.server.exceptions.IndexDoesNotExistException;
 import io.zulia.server.exceptions.ShardDoesNotExistException;
 import io.zulia.server.field.FieldTypeUtil;
 import io.zulia.server.filestorage.DocumentStorage;
@@ -816,6 +817,10 @@ public double getShardTolerance() {
 	public void reloadIndexSettings() throws Exception {
 
 		IndexSettings indexSettings = indexService.getIndex(indexName);
+		if (indexSettings == null) {
+			throw new IndexDoesNotExistException(indexName);
+		}
+
 		indexConfig.configure(indexSettings);
 		configureFacets();
 		zuliaPerFieldAnalyzer.refresh();

diff --git a/zulia-server/src/main/java/io/zulia/server/index/ZuliaIndexManager.java b/zulia-server/src/main/java/io/zulia/server/index/ZuliaIndexManager.java
@@ -159,6 +159,10 @@ private void loadIndex(String indexName) throws Exception {
 
 		IndexSettings indexSettings = indexService.getIndex(indexName);
 
+		if (indexSettings == null) {
+			throw new IndexDoesNotExistException(indexName);
+		}
+
 		loadIndex(indexSettings);
 	}