add password mechanism for pingest; accommodate deadlock bug

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/run_pines_upgrade.sh b/Open-ILS/src/sql/Pg/version-upgrade/run_pines_upgrade.sh
index 7e6c411..7bc7689 100755 (executable)
--- a/Open-ILS/src/sql/Pg/version-upgrade/run_pines_upgrade.sh
+++ b/Open-ILS/src/sql/Pg/version-upgrade/run_pines_upgrade.sh
@@ -1,5 +1,16 @@
 #!/bin/bash
 
+pg_passwd=$1
+
+Usage() {
+    echo "USAGE: $0 <evergreen postgresql password>"
+    exit 1
+}
+
+if [ -z "$pg_passwd" ]; then
+    Usage
+fi
+
 SCRIPTS="
 3.6.1-3.6.2-upgrade-db.sql
 3.6.2-3.7.0-upgrade-db.sql
@@ -43,6 +54,19 @@ for i in title author subject series identifier keyword; do
 done
 
 echo "Beginning parallel regingest at `date`"
-# time PGUSER=evergreen PGPASSWORD="youwish" pines/Open-ILS/src/support-scripts/pingest.pl --batch-size 10000 --max-child 8 --skip-browse
+# disable triggers to prevent deadlocks - see https://bugs.launchpad.net/evergreen/+bug/1931737
+psql -U evergreen -c "ALTER TABLE metabib.title_field_entry DISABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.author_field_entry DISABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.subject_field_entry DISABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.series_field_entry DISABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.keyword_field_entry DISABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.identifier_field_entry DISABLE TRIGGER maintain_symspell_entries_tgr"
+time PGUSER=evergreen PGPASSWORD="$pg_passwd" pines/Open-ILS/src/support-scripts/pingest.pl --batch-size 10000 --max-child 8 --skip-browse
+psql -U evergreen -c "ALTER TABLE metabib.title_field_entry ENABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.author_field_entry ENABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.subject_field_entry ENABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.series_field_entry ENABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.keyword_field_entry ENABLE TRIGGER maintain_symspell_entries_tgr"
+psql -U evergreen -c "ALTER TABLE metabib.identifier_field_entry ENABLE TRIGGER maintain_symspell_entries_tgr"
 
 echo "Finished PINES 3.8.0 upgrade at `date`."