From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 4 Jul 2019 13:50:22 +0000 (+0000)
Subject: bug 793: fix detection of database not completely inited
X-Git-Tag: v6.0.2rc1~11
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=c19c5653c9ca00d27f4a9247973e5a811f14dfde

bug 793: fix detection of database not completely inited

Change-Id: I79c099efb87f36e6251aa30d9eff1b1a223a73a9
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/database_utils/migrate_mano_db.sh b/database_utils/migrate_mano_db.sh
index e89c389f..096a21ad 100755
--- a/database_utils/migrate_mano_db.sh
+++ b/database_utils/migrate_mano_db.sh
@@ -1545,8 +1545,8 @@ DATABASE_PROCESS=`echo "select comments from schema_version where version_int=0;
 if [[ -z "$DATABASE_PROCESS" ]] ; then  # migration a non empty database
     check_migration_needed || exit 0
     # Create a backup database content
-    [[ -n "$BACKUP_DIR" ]] && BACKUP_FILE="$(mktemp -q  "${BACKUP_DIR}/backupdb.XXXXXX.sql")"
-    [[ -z "$BACKUP_DIR" ]] && BACKUP_FILE="$(mktemp -q --tmpdir "backupdb.XXXXXX.sql")"
+    [[ -n "$BACKUP_DIR" ]] && BACKUP_FILE=$(mktemp -q  "${BACKUP_DIR}/backupdb.XXXXXX.sql")
+    [[ -z "$BACKUP_DIR" ]] && BACKUP_FILE=$(mktemp -q --tmpdir "backupdb.XXXXXX.sql")
     mysqldump $DEF_EXTRA_FILE_PARAM --add-drop-table --add-drop-database --routines --databases $DBNAME > $BACKUP_FILE ||
         ! echo "Cannot create Backup file '$BACKUP_FILE'" >&2 || exit 1
     echo "    Backup file '$BACKUP_FILE' created"
diff --git a/scripts/RO-start.sh b/scripts/RO-start.sh
index 9297559a..47547cdd 100755
--- a/scripts/RO-start.sh
+++ b/scripts/RO-start.sh
@@ -17,22 +17,22 @@ function is_db_created() {
     db_version=$6  # minimun database version
 
     if mysqlshow -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" | grep -v Wildcard | grep -q -e "$db_name" ; then
-        if echo "SELECT * FROM schema_version WHERE version='0'" |
+        if echo "SELECT comments FROM schema_version WHERE version_int=0;" |
                 mysql -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" "$db_name" |
                 grep -q -e "init" ; then
-            echo " DB $db_name exists BUT failed in previous init"
+            echo " DB $db_name exists BUT failed in previous init" >&2
             return 1
-        elif echo "SELECT * FROM schema_version WHERE version='$db_version'" |
+        elif echo "SELECT * FROM schema_version WHERE version_int=$db_version;" |
                 mysql -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" "$db_name" |
                 grep -q -e "$db_version" ; then
-            echo " DB $db_name exists and inited"
+            echo " DB $db_name exists and inited" >&2
             return 0
         else
-            echo " DB $db_name exists BUT not inited"
+            echo " DB $db_name exists BUT not inited" >&2
             return 1
         fi
     fi
-    echo " DB $db_name does not exist"
+    echo " DB $db_name does not exist" >&2
     return 1
 }
 
@@ -70,7 +70,7 @@ function wait_db(){
         #wait 120 sec
         if [ $attempt -ge $max_attempts ]; then
             echo
-            echo "Cannot connect to database ${db_host}:${db_port} during $max_attempts sec"
+            echo "Cannot connect to database ${db_host}:${db_port} during $max_attempts sec" >&2
             return 1
         fi
         attempt=$[$attempt+1]
@@ -94,7 +94,7 @@ wait_db "$RO_DB_HOST" "$RO_DB_PORT" || exit 1
 echo "3/4 Init database"
 RO_PATH=`python -c 'import osm_ro; print(osm_ro.__path__[0])'`
 echo "RO_PATH: $RO_PATH"
-if ! is_db_created "$RO_DB_HOST" "$RO_DB_PORT" "$RO_DB_USER" "$RO_DB_PASSWORD" "$RO_DB_NAME" "0.27"
+if ! is_db_created "$RO_DB_HOST" "$RO_DB_PORT" "$RO_DB_USER" "$RO_DB_PASSWORD" "$RO_DB_NAME" "27"
 then
     if [ -n "$RO_DB_ROOT_PASSWORD" ] ; then
         mysqladmin -h"$RO_DB_HOST" -uroot -p"$RO_DB_ROOT_PASSWORD" create "$RO_DB_NAME"
@@ -114,7 +114,7 @@ fi
 OVIM_PATH=`python -c 'import lib_osm_openvim; print(lib_osm_openvim.__path__[0])'`
 echo "OVIM_PATH: $OVIM_PATH"
 if ! is_db_created "$RO_DB_OVIM_HOST" "$RO_DB_OVIM_PORT" "$RO_DB_OVIM_USER" "$RO_DB_OVIM_PASSWORD" "$RO_DB_OVIM_NAME" \
-    "0.22"
+    "22"
 then
     if [ -n "$RO_DB_OVIM_ROOT_PASSWORD" ] ; then
         mysqladmin -h"$RO_DB_OVIM_HOST" -uroot -p"$RO_DB_OVIM_ROOT_PASSWORD" create "$RO_DB_OVIM_NAME"