From 08da7d30f37a3ce075a4efa53701e217321b77ba Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Fri, 11 Feb 2022 17:17:03 +0100 Subject: [PATCH] fix(migration): migrate all versions Signed-off-by: Rajesh Rajendran --- scripts/helmcharts/openreplay/files/clickhouse.sh | 6 +++--- scripts/helmcharts/openreplay/files/dbops.sh | 12 +++++++----- scripts/helmcharts/openreplay/files/postgresql.sh | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/helmcharts/openreplay/files/clickhouse.sh b/scripts/helmcharts/openreplay/files/clickhouse.sh index 503fd97bf..3f9c2954e 100644 --- a/scripts/helmcharts/openreplay/files/clickhouse.sh +++ b/scripts/helmcharts/openreplay/files/clickhouse.sh @@ -1,13 +1,13 @@ #!/bin/bash -set -e +set -ex clickhousedir=/opt/openreplay/openreplay/scripts/helm/db/init_dbs/clickhouse function migrate() { echo "Starting clickhouse migration" - migration_versions=$1 - for version in $migration_versions; do + IFS=',' read -r -a migration_versions <<< "$1" + for version in ${migration_versions[*]}; do echo "Migrating clickhouse version $version" # For now, we can ignore the clickhouse db inject errors. # TODO: Better error handling in script diff --git a/scripts/helmcharts/openreplay/files/dbops.sh b/scripts/helmcharts/openreplay/files/dbops.sh index fddde5b84..f856ae40b 100644 --- a/scripts/helmcharts/openreplay/files/dbops.sh +++ b/scripts/helmcharts/openreplay/files/dbops.sh @@ -27,22 +27,24 @@ function migration() { # Checking migration versions cd /opt/openreplay/openreplay/scripts/helm migration_versions=(`ls -l db/init_dbs/$db | grep -E ^d | awk -v number=${PREVIOUS_APP_VERSION} '$NF > number {print $NF}' | grep -v create`) - echo "Migration version: $migration_versions" + echo "Migration version: ${migration_versions[*]}" + # Can't pass the space seperated array to ansible for migration. So joining them with , + joined_migration_versions=$(IFS=, ; echo "${migration_versions[*]}") cd - case "$1" in postgresql) - /bin/bash postgresql.sh migrate $migration_versions + /bin/bash postgresql.sh migrate $joined_migration_versions ;; minio) - /bin/bash minio.sh migrate $migration_versions + /bin/bash minio.sh migrate $joined_migration_versions ;; clickhouse) - /bin/bash clickhouse.sh migrate $migration_versions + /bin/bash clickhouse.sh migrate $joined_migration_versions ;; kafka) - /bin/bash kafka.sh migrate $migration_versions + /bin/bash kafka.sh migrate $joined_migration_versions ;; *) echo "Unknown operation for db migration; exiting." diff --git a/scripts/helmcharts/openreplay/files/postgresql.sh b/scripts/helmcharts/openreplay/files/postgresql.sh index a12a65c44..cea47a73e 100644 --- a/scripts/helmcharts/openreplay/files/postgresql.sh +++ b/scripts/helmcharts/openreplay/files/postgresql.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -ex pgdir=/opt/openreplay/openreplay/scripts/helm/db/init_dbs/postgresql @@ -14,8 +14,8 @@ pgdir=/opt/openreplay/openreplay/scripts/helm/db/init_dbs/postgresql function migrate() { echo "Starting postgresql migration" - migration_versions=$1 - for version in $migration_versions; do + IFS=',' read -r -a migration_versions <<< "$1" + for version in ${migration_versions[*]}; do echo "Migrating postgresql version $version" psql -f ${pgdir}/${version}/${version}.sql done