Merge pull request #793 from lonvia/refresh-on-start

Force a refresh on startup and after updates
komoot · Apr 19, 2024 · 15d9a70 · 15d9a70
2 parents 438c511 + e4ce24b
commit 15d9a70
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/de/komoot/photon/App.java b/src/main/java/de/komoot/photon/App.java
@@ -53,7 +53,7 @@ public static void main(String[] rawArgs) throws Exception {
             // Working on an existing installation.
             // Update the index settings in case there are any changes.
             esServer.updateIndexSettings(args.getSynonymFile());
-            esServer.waitForReady();
+            esServer.refreshIndexes();
 
             if (args.isNominatimUpdate()) {
                 shutdownES = true;

diff --git a/src/main/java/de/komoot/photon/elasticsearch/Server.java b/src/main/java/de/komoot/photon/elasticsearch/Server.java
@@ -126,6 +126,11 @@ public void waitForReady() {
         esClient.admin().cluster().prepareHealth().setWaitForYellowStatus().get();
     }
 
+    public void refreshIndexes() {
+        esClient.admin().cluster().prepareHealth().setWaitForYellowStatus().get();
+        esClient.admin().indices().prepareRefresh(PhotonIndex.NAME).get();
+    }
+
     /**
      * stops the elasticsearch node
      */

diff --git a/src/main/java/de/komoot/photon/elasticsearch/Updater.java b/src/main/java/de/komoot/photon/elasticsearch/Updater.java
@@ -29,6 +29,7 @@ public Updater(Client esClient, String[] languages, String[] extraTags) {
 
     public void finish() {
         this.updateDocuments();
+        esClient.admin().indices().prepareRefresh(PhotonIndex.NAME).get();
     }
 
     @Override