Upload start.sh

scripts/start.sh

@@ -11,19 +11,16 @@ if [ ! -d /data ]; then
   data_root="/app/es-data"
 fi
 export DATA_ROOT="${DATA_ROOT:-${app_data_root}}"
-mkdir -p "${data_root}" /app/logs "${DATA_ROOT}"
+snapshot_repo_root="${DATA_ROOT}/es-repositories"
+mkdir -p "${data_root}" /app/logs "${DATA_ROOT}" "${snapshot_repo_root}/production" "${snapshot_repo_root}/probe"
 if [ -n "${bucket_dir}" ]; then
-  mkdir -p "${bucket_dir}/snapshots/probe" "${bucket_dir}/snapshots/production"
-  # Elasticsearch runs as its own user and must create repository verification blobs.
-  if ! chown elasticsearch:elasticsearch "${bucket_dir}/snapshots" "${bucket_dir}/snapshots/probe" "${bucket_dir}/snapshots/production"; then
-    chmod 0777 "${bucket_dir}/snapshots" "${bucket_dir}/snapshots/probe" "${bucket_dir}/snapshots/production"
-  fi
+  mkdir -p "${bucket_dir}/generations"
 fi
 index_version="$(python -c 'from app.config import INDEX_VERSION; print(INDEX_VERSION)')"
 version_file="${DATA_ROOT}/es-index-version"
 status_file="${DATA_ROOT}/index-status"
 
-chown -R elasticsearch:elasticsearch "${data_root}" /app/logs
+chown -R elasticsearch:elasticsearch "${data_root}" /app/logs "${snapshot_repo_root}"
 cat > "${ES_HOME}/config/elasticsearch.yml" <<EOF
 cluster.name: bha-lite
 node.name: bha-lite-node
@@ -34,22 +31,21 @@ xpack.security.enabled: false
 xpack.security.http.ssl.enabled: false
 path.data: ${data_root}
 path.logs: /app/logs
+path.repo: ${snapshot_repo_root}
 EOF
-if [ -n "${bucket_dir}" ]; then
-  printf 'path.repo: %s\n' "${bucket_dir}/snapshots" >> "${ES_HOME}/config/elasticsearch.yml"
-fi
 chown elasticsearch:elasticsearch "${ES_HOME}/config/elasticsearch.yml"
 uvicorn app.main:app --host 0.0.0.0 --port "${PORT}" &
 api_pid="$!"
 su -s /bin/bash elasticsearch -c "${ES_HOME}/bin/elasticsearch" &
 es_pid="$!"
 (
+  trap 'rc=$?; printf "failed" > "${status_file}"; kill "${api_pid}" "${es_pid}" 2>/dev/null || true; exit "${rc}"' ERR
   /app/scripts/wait-for-es.sh
   if [ "${BHA_BUCKET_PROBE:-0}" = "1" ]; then
     python -m app.bucket_probe "${bucket_dir}"
     exit $?
   fi
-  if [ -n "${bucket_dir}" ]; then
+  if [ -n "${bucket_dir}" ] && [ "${RESET_INDEX:-0}" != "1" ]; then
     printf 'restoring' > "${status_file}"
     if python -m app.bucket_snapshot restore "${bucket_dir}"; then
       printf '%s' "${index_version}" > "${version_file}"
@@ -69,6 +65,8 @@ es_pid="$!"
     fi
   else
     printf 'failed' > "${status_file}"
+    kill "${api_pid}" "${es_pid}" 2>/dev/null || true
+    exit 1
   fi
 ) &
 indexer_pid="$!"