Skip to content

Fix issue with index script #1811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdoyle-temple merged 1 commit into from
Aug 19, 2026
Merged

Fix issue with index script #1811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions funcake_dags/scripts/index.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,8 @@ sed -i.bak 's/"solr_writer.commit_on_close": true/"solr_writer.commit_on_close":
rm lib/$INDEXER.rb.bak

# grab list of items from designated aws bucket (creds are envvars), then index each item
if [ -n "$DATA" ]; then
RESP=$(echo "$DATA" | jq -r '.[]')
else
RESP=`aws s3 ls s3://$BUCKET/$FOLDER | awk '{print $4}'`
fi

TEMPFILE=$(mktemp /tmp/index-output.XXXXXX)
PUBLISH_TASK_REPORT=$AIRFLOW_HOME/dags/funcake_dags/scripts/publish_task_report.rb

for record_set in `echo $RESP`
do
if [ -n "$DATA" ]; then
source_key=$record_set
else
source_key=$FOLDER$record_set
fi
bundle exec $INDEXER ingest $(aws s3 presign s3://$BUCKET/$source_key) 2>&1 | tee -a $TEMPFILE
done
report_and_cleanup() {
rc=$?
cat "$TEMPFILE" | ruby "$PUBLISH_TASK_REPORT" || true
Expand All @@ -52,15 +36,33 @@ report_and_cleanup() {
trap report_and_cleanup EXIT

# grab list of items from designated aws bucket (creds are envvars), then index each item
RESP=$(aws s3 ls "s3://$BUCKET/$FOLDER" | awk '{print $4}')
if [ -z "$RESP" ]; then echo "ERROR: no record sets found at s3://$BUCKET/$FOLDER"; exit 1; fi
if [ -n "$DATA" ]; then
RESP=$(echo "$DATA" | jq -r '.[]')
else
RESP=$(aws s3 ls "s3://$BUCKET/$FOLDER" | awk '{print $4}')
fi

if [ -z "$RESP" ]; then
if [ -n "$DATA" ]; then
echo "ERROR: no record sets provided in DATA"
else
echo "ERROR: no record sets found at s3://$BUCKET/$FOLDER"
fi
exit 1
fi

RESP_COUNT=$(echo $RESP | wc -w | tr -d '[:space:]')

i=0
for record_set in $RESP
do
i=$((i+1))
url=$(aws s3 presign "s3://$BUCKET/$FOLDER$record_set")
if [ -n "$DATA" ]; then
source_key=$record_set
else
source_key=$FOLDER$record_set
fi
url=$(aws s3 presign "s3://$BUCKET/$source_key")
bundle exec $INDEXER ingest "$url" 2>&1 | tee -a "$TEMPFILE"
INGEST_COUNT=$(grep -c 'finished Traject::Indexer\#process:.*records in.*seconds' "$TEMPFILE" || true)
if [ "$INGEST_COUNT" -ne "$i" ]; then
Expand Down