Skip to content
Snippets Groups Projects
Verified Commit c3da21c2 authored by Konrad Botor's avatar Konrad Botor
Browse files

Renamed 'setup_db' to 'install_app' and 'drop_db' to 'uninstall_app'

parent de73e4bb
No related branches found
No related tags found
2 merge requests!827Merge develop changes to master,!624Script rename
...@@ -295,7 +295,7 @@ prepare_hivemind_image: ...@@ -295,7 +295,7 @@ prepare_hivemind_image:
- hivemind_image.env - hivemind_image.env
tags: *shared_tags tags: *shared_tags
cleanup_haf_cache_manual: cleanup_hivemind_haf_cache_manual:
extends: .cleanup_cache_manual extends: .cleanup_cache_manual
stage: cleanup stage: cleanup
variables: variables:
...@@ -304,6 +304,17 @@ cleanup_haf_cache_manual: ...@@ -304,6 +304,17 @@ cleanup_haf_cache_manual:
tags: tags:
- data-cache-storage - data-cache-storage
# This job cleans up both Hivemind-specific cache and cache shared between projects, so it should be used in emergencies only.
# For example, if prepare_haf_data job fails in the same way in Hivemind and HAfAH.
cleanup_haf_cache_manual:
extends: .cleanup_cache_manual
stage: cleanup
variables:
CLEANUP_PATH_PATTERN: "/cache/replay_data_hivemind_* /cache/replay_data_haf_*"
resource_group: ${CI_COMMIT_SHA}
tags:
- data-cache-storage
download_await: download_await:
extends: .job-defaults extends: .job-defaults
image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-2 image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-2
......
...@@ -58,7 +58,7 @@ setup() { ...@@ -58,7 +58,7 @@ setup() {
log "setup" "Setting up the database..." log "setup" "Setting up the database..."
cd /home/hivemind/app cd /home/hivemind/app
./setup_postgres.sh --postgres-url="${POSTGRES_ADMIN_URL}" ./setup_postgres.sh --postgres-url="${POSTGRES_ADMIN_URL}"
./setup_db.sh --postgres-url="${POSTGRES_ADMIN_URL}" ./install_app.sh --postgres-url="${POSTGRES_ADMIN_URL}"
if [[ "$ADD_MOCKS" == "true" ]]; then if [[ "$ADD_MOCKS" == "true" ]]; then
log "setup" "Adding mocks to database..." log "setup" "Adding mocks to database..."
# shellcheck source=/dev/null # shellcheck source=/dev/null
......
do $$ do $$
BEGIN BEGIN
ASSERT EXISTS (SELECT * FROM pg_extension WHERE extname='intarray'), 'The database requires created "intarray" extension'; ASSERT EXISTS (SELECT * FROM pg_extension WHERE extname='intarray'), 'The database requires created "intarray" extension';
ASSERT (SELECT setting FROM pg_settings where name='join_collapse_limit' and source='database')::int = 16, 'Bad optimizer settings, use setup_db.sh script to setup target database correctly'; ASSERT (SELECT setting FROM pg_settings where name='join_collapse_limit' and source='database')::int = 16, 'Bad optimizer settings, use install_app.sh script to setup target database correctly';
ASSERT (SELECT setting FROM pg_settings where name='from_collapse_limit' and source='database')::int = 16, 'Bad optimizer settings, use setup_db.sh script to setup target database correctly'; ASSERT (SELECT setting FROM pg_settings where name='from_collapse_limit' and source='database')::int = 16, 'Bad optimizer settings, use install_app.sh script to setup target database correctly';
ASSERT (SELECT setting FROM pg_settings where name='jit' and source='database')::BOOLEAN = False, 'Bad optimizer settings, use setup_db.sh script to setup target database correctly'; ASSERT (SELECT setting FROM pg_settings where name='jit' and source='database')::BOOLEAN = False, 'Bad optimizer settings, use install_app.sh script to setup target database correctly';
END$$; END$$;
CREATE TABLE IF NOT EXISTS hivemind_app.hive_db_patch_level CREATE TABLE IF NOT EXISTS hivemind_app.hive_db_patch_level
......
...@@ -5,7 +5,7 @@ set -euo pipefail ...@@ -5,7 +5,7 @@ set -euo pipefail
SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
LOG_FILE=setup_db.log LOG_FILE=install_app.log
# shellcheck source=./common.sh # shellcheck source=./common.sh
source "$SCRIPTPATH/common.sh" source "$SCRIPTPATH/common.sh"
...@@ -66,4 +66,4 @@ else ...@@ -66,4 +66,4 @@ else
POSTGRES_ACCESS=$POSTGRES_URL POSTGRES_ACCESS=$POSTGRES_URL
fi fi
psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -f "${SCRIPTPATH}/setup_db.sql" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -f "${SCRIPTPATH}/install_app.sql"
File moved
...@@ -58,7 +58,7 @@ done ...@@ -58,7 +58,7 @@ done
POSTGRES_ACCESS_ADMIN=${POSTGRES_URL:-"postgresql://$POSTGRES_USER@$POSTGRES_HOST:$POSTGRES_PORT/haf_block_log"} POSTGRES_ACCESS_ADMIN=${POSTGRES_URL:-"postgresql://$POSTGRES_USER@$POSTGRES_HOST:$POSTGRES_PORT/haf_block_log"}
drop_db() { uninstall_app() {
psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "do \$\$ BEGIN if hive.app_context_exists('hivemind_app') THEN perform hive.app_remove_context('hivemind_app'); end if; END \$\$" psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "do \$\$ BEGIN if hive.app_context_exists('hivemind_app') THEN perform hive.app_remove_context('hivemind_app'); end if; END \$\$"
psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "DROP SCHEMA IF EXISTS hivemind_app CASCADE;" psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "DROP SCHEMA IF EXISTS hivemind_app CASCADE;"
psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "REASSIGN OWNED BY hivemind TO postgres; " psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "REASSIGN OWNED BY hivemind TO postgres; "
...@@ -66,4 +66,4 @@ drop_db() { ...@@ -66,4 +66,4 @@ drop_db() {
psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "DROP ROLE hivemind" psql "$POSTGRES_ACCESS_ADMIN" -v "ON_ERROR_STOP=ON" -c "DROP ROLE hivemind"
} }
drop_db uninstall_app
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment