Merge pull request #6530 from poikilotherm/6529-solr-script

Enhancing the Solr schema update script. See #6529
IQSS · Jan 16, 2020 · 804eac3 · 804eac3
2 parents 32be08e + c29c461
commit 804eac3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/conf/solr/7.3.1/updateSchemaMDB.sh b/conf/solr/7.3.1/updateSchemaMDB.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -euo pipefail
 
 # This script updates the <field> and <copyField> schema configuration necessary to properly
@@ -61,6 +61,12 @@ echo "Retrieve schema data from ${DATAVERSE_URL}/api/admin/index/solr/schema"
 TMPFILE=`mktemp`
 curl -f -sS "${DATAVERSE_URL}/api/admin/index/solr/schema${UNBLOCK_KEY}" > $TMPFILE
 
+### Fail gracefull if Dataverse is not ready yet.
+if [[ "`wc -l ${TMPFILE}`" < "3" ]]; then
+  echo "Dataverse responded with empty file. When running on K8s: did you bootstrap yet?"
+  exit 123
+fi
+
 ### Processing
 echo "Writing ${TARGET}/schema_dv_mdb_fields.xml"
 echo "<fields>" > ${TARGET}/schema_dv_mdb_fields.xml
@@ -76,4 +82,4 @@ rm ${TMPFILE}*
 
 ### Reloading
 echo "Triggering Solr RELOAD at ${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
-curl -f -sS "${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
+curl -f -sS "${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"