Fix optimization and restart scripts, re-enable optimization in RACK …

…UI (#949) Resolves Issue #945
ge-high-assurance · Mar 28, 2023 · 638f29d · 638f29d
1 parent a0cd804
commit 638f29d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/cli/optimize.sh b/cli/optimize.sh
@@ -8,8 +8,11 @@ FUSEKI_PID=$(systemctl show --property MainPID fuseki)
 FUSEKI_PID=${FUSEKI_PID#"MainPID="}
 if [ -n "${FUSEKI_PID}" ]; then
     systemctl stop fuseki
-    # systemctl doesn't always seem to succeed, so be quite certain
-    # until we figure out why it doesn't always succeed
+fi
+# systemctl stop doesn't always work, so kill -9 for now to be sure
+FUSEKI_PID=$(systemctl show --property MainPID fuseki)
+FUSEKI_PID=${FUSEKI_PID#"MainPID="}
+if [ -n "${FUSEKI_PID}" ]; then
     kill -9 "${FUSEKI_PID}" > /dev/null 2>&1
 fi
 

diff --git a/cli/restart-fuseki.sh b/cli/restart-fuseki.sh
@@ -5,11 +5,13 @@ set -e
 
 FUSEKI_PID=$(systemctl show --property MainPID fuseki)
 FUSEKI_PID=${FUSEKI_PID#"MainPID="}
-
 if [ -n "${FUSEKI_PID}" ]; then
     systemctl stop fuseki
-    # systemctl doesn't always seem to succeed, so be quite certain
-    # until we figure out why it doesn't always succeed
+fi
+# systemctl stop doesn't always work, so kill -9 for now to be sure
+FUSEKI_PID=$(systemctl show --property MainPID fuseki)
+FUSEKI_PID=${FUSEKI_PID#"MainPID="}
+if [ -n "${FUSEKI_PID}" ]; then
     kill -9 "${FUSEKI_PID}" > /dev/null 2>&1
 fi
 

diff --git a/rack-ui/pages/load.py b/rack-ui/pages/load.py
@@ -208,8 +208,8 @@ def run_ingest(load_button_clicks, status_filepath, zip_filepath, load_options):
         last_loaded_graphs = manifest.getModelgraphsFootprint() + manifest.getDatagraphsFootprint()
 
         # optimize triple store
-        #if manifest.getNeedsOptimization():
-        #    rack.invoke_optimization(None)
+        if manifest.getNeedsOptimization():
+            rack.invoke_optimization(None)
 
         time.sleep(3)
     except Exception as e: