Cron and package updates.

Author: olsonanl

daily_cron.sh

@@ -1,8 +1,15 @@
 start=$(date +%s)
 cd /disks/disk0/p3/production/p3-api/deployment/services/p3_api_service/app/
-./node_modules/pm2/bin/pm2 stop p3-index-worker
+
+#
+# Nov 2022 - index worker started by cron
+# instead of doing a clean, we create the file clean_requested so that the worker cron can handle it next time around
+
+#./node_modules/pm2/bin/pm2 stop p3-index-worker
+
 # ./node_modules/pm2/bin/pm2 reload p3-api-service
-./bin/p3-clean-completed
+#./bin/p3-clean-completed
+touch clean_requested
 
 for collection in feature_sequence genome genome_amr genome_feature genome_sequence pathway subsystem sp_gene
 do
@@ -11,7 +18,7 @@ do
 done
 
 # restart index worker
-./node_modules/pm2/bin/pm2 start p3-index-worker
+#./node_modules/pm2/bin/pm2 start p3-index-worker
 
 # print duration
 echo "Duration: $((($(date +%s)-$start)/60)) minutes"

package.json

@@ -29,6 +29,7 @@
     "event-stream": "^3.3.2",
     "express": "^4.16.3",
     "file-queue": "^0.2.1",
+    "forever": "^4.0.3",
     "formidable": "^1.2.2",
     "fs-extra": "~0.12.0",
     "json-patch": "^0.6.1",

weekly_cron.sh

@@ -9,21 +9,23 @@ function synchronous_backup() {
     local snapshot=$2
     echo "Running Backup: $collection $snapshot"
 
+    async_key="$collection.$snapshot.x"
     # fire backup call
-    curl --silent "$SOLR_URL/admin/collections?action=BACKUP&name=$snapshot/$collection&collection=$collection&location=$BACKUP_DIR&async=$collection.$snapshot"
+    curl --silent "$SOLR_URL/admin/collections?action=BACKUP&name=$snapshot/$collection&collection=$collection&location=$BACKUP_DIR&async=$async_key"
 
     # status check
     STATUS="running"
     while [ $STATUS == "running" ]
     do
-        STATUS=$(curl --silent "$SOLR_URL/admin/collections?action=REQUESTSTATUS&requestid=$collection.$snapshot&wt=json" | grep "state" | sed -e 's/[{},"]/''/g' | cut -d ':' -f 2 )
+        STATUS=$(curl --silent "$SOLR_URL/admin/collections?action=REQUESTSTATUS&requestid=$async_key&wt=json" | grep "state" | sed -e 's/[{},"]/''/g' | cut -d ':' -f 2 )
         echo "[$(date '+%m/%d/%Y %H:%M:%S')] $collection $STATUS"
         sleep 2m
     done
 }
 
 # stop indexer
 cd /disks/disk0/p3/production/p3-api/deployment/services/p3_api_service/app/
+export PATH=/disks/patric-common/runtime/node-v14.18.0/bin:$PATH
 ./node_modules/pm2/bin/pm2 stop p3-index-worker
 
 echo "# large collections in asychronous mode"
@@ -45,4 +47,4 @@ do
 done
 
 # start indexer
-./node_modules/pm2/bin/pm2 start p3-index-worker
+# ./node_modules/pm2/bin/pm2 start p3-index-worker