Eli Mesika has uploaded a new change for review. Change subject: core:running the db scripts manually with user... ......................................................................
core:running the db scripts manually with user... running the db scripts manually with user posgres will change the table permission and upgrade will fail since user engine cannot change tables Setting user "engine" as the deault user for all the following utilities: backup.sh create_db.sh create_db_devel.sh create_schema.sh encryptionvalidator.sh encodingvalidator.sh exportDbSchema.sh fkvalidator.sh refreshStoredProcedures.sh restore.sh taskcleaner.sh unlock_entity.sh upgrade.sh Change-Id: I8ae8999dcfad53a1e62613dbff915f76b32e89de Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=958765 Signed-off-by: Eli Mesika <[email protected]> --- M backend/manager/dbscripts/backup.sh M backend/manager/dbscripts/create_db.sh M backend/manager/dbscripts/create_db_devel.sh M backend/manager/dbscripts/create_schema.sh M backend/manager/dbscripts/dbcustomfunctions.sh M backend/manager/dbscripts/encryptionvalidator.sh M backend/manager/dbscripts/exportDbSchema.sh M backend/manager/dbscripts/refreshStoredProcedures.sh M backend/manager/dbscripts/restore.sh M backend/manager/dbscripts/unlock_entity.sh M backend/manager/dbscripts/upgrade.sh M backend/manager/tools/dbutils/common.sh M backend/manager/tools/dbutils/encodingvalidator.sh M backend/manager/tools/dbutils/fkvalidator.sh M backend/manager/tools/dbutils/taskcleaner.sh 15 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/14438/1 diff --git a/backend/manager/dbscripts/backup.sh b/backend/manager/dbscripts/backup.sh index 0664161..40f4260 100755 --- a/backend/manager/dbscripts/backup.sh +++ b/backend/manager/dbscripts/backup.sh @@ -20,7 +20,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-v - Turn on verbosity (WARNING: lots of output)\n" printf "\t-l DIR - Backup file directory. ${DIR}\n" printf "\t-f FILENAME - Backup file name. ${FILENAME}\n" diff --git a/backend/manager/dbscripts/create_db.sh b/backend/manager/dbscripts/create_db.sh index 6ab22fa..b51c12e 100755 --- a/backend/manager/dbscripts/create_db.sh +++ b/backend/manager/dbscripts/create_db.sh @@ -13,7 +13,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-g NOMD5 - Do not generate MD55 for files (generated in dev env only) (def. ${NOMD5}\n" printf "\t-m MD5DIR - The directory for generated MD5 files (generated in dev env only) (def. ${MD5DIR}\n" diff --git a/backend/manager/dbscripts/create_db_devel.sh b/backend/manager/dbscripts/create_db_devel.sh index 46177bc..78d8b19 100755 --- a/backend/manager/dbscripts/create_db_devel.sh +++ b/backend/manager/dbscripts/create_db_devel.sh @@ -14,7 +14,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-v - Turn on verbosity (WARNING: lots of output)\n" printf "\t-h - This help text.\n" diff --git a/backend/manager/dbscripts/create_schema.sh b/backend/manager/dbscripts/create_schema.sh index dfaaaa0..567167a 100755 --- a/backend/manager/dbscripts/create_schema.sh +++ b/backend/manager/dbscripts/create_schema.sh @@ -13,7 +13,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-g NOMD5 - Do not generate MD55 for files (generated in dev env only) (def. ${NOMD5}\n" printf "\t-m MD5DIR - The directory for generated MD5 files (generated in dev env only) (def. ${MD5DIR}\n" diff --git a/backend/manager/dbscripts/dbcustomfunctions.sh b/backend/manager/dbscripts/dbcustomfunctions.sh index 0994e7e..f92830d 100755 --- a/backend/manager/dbscripts/dbcustomfunctions.sh +++ b/backend/manager/dbscripts/dbcustomfunctions.sh @@ -12,7 +12,7 @@ SERVERNAME="localhost" PORT="5432" DATABASE="engine" - USERNAME="" + USERNAME="engine" VERBOSE=false LOGFILE="$ME.log" DBOBJECT_OWNER="engine" diff --git a/backend/manager/dbscripts/encryptionvalidator.sh b/backend/manager/dbscripts/encryptionvalidator.sh index 665b715..4b1b4a7 100755 --- a/backend/manager/dbscripts/encryptionvalidator.sh +++ b/backend/manager/dbscripts/encryptionvalidator.sh @@ -25,7 +25,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-c CERTIFICATE- The certificate file to use for the encryption.(def /etc/pki/ovirt-engine/certs/engine.cer)\n" printf "\t-f - Fix the non encrypted data in DB.\n" diff --git a/backend/manager/dbscripts/exportDbSchema.sh b/backend/manager/dbscripts/exportDbSchema.sh index 8804900..a17e69b 100755 --- a/backend/manager/dbscripts/exportDbSchema.sh +++ b/backend/manager/dbscripts/exportDbSchema.sh @@ -12,7 +12,7 @@ printf "\n" printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE}\n" printf "\t-v - Turn on verbosity (WARNING: lots of output)\n" printf "\t-h - This help text.\n" diff --git a/backend/manager/dbscripts/refreshStoredProcedures.sh b/backend/manager/dbscripts/refreshStoredProcedures.sh index ead1ae4..bbde403 100755 --- a/backend/manager/dbscripts/refreshStoredProcedures.sh +++ b/backend/manager/dbscripts/refreshStoredProcedures.sh @@ -12,7 +12,7 @@ printf "\n" printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE}\n" printf "\t-v - Turn on verbosity (WARNING: lots of output)\n" printf "\t-h - This help text.\n" diff --git a/backend/manager/dbscripts/restore.sh b/backend/manager/dbscripts/restore.sh index 2cb86e6..30f181b 100755 --- a/backend/manager/dbscripts/restore.sh +++ b/backend/manager/dbscripts/restore.sh @@ -17,7 +17,7 @@ printf "\n" printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" - printf "\t-u USERNAME - The username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-d DATABASE - The database name, this must match the db name recorded in the backup file.\n" printf "\t-f File - Backup file name to restore from. ${FILE}\n" printf "\t-r - Remove existing database with same name\n" diff --git a/backend/manager/dbscripts/unlock_entity.sh b/backend/manager/dbscripts/unlock_entity.sh index 5ec9d01..f109f88 100755 --- a/backend/manager/dbscripts/unlock_entity.sh +++ b/backend/manager/dbscripts/unlock_entity.sh @@ -15,7 +15,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-r - Recursive, unlocks all disks under the selected vm/template.\n" printf "\t-q - Query db and display a list of the locked entites.\n" diff --git a/backend/manager/dbscripts/upgrade.sh b/backend/manager/dbscripts/upgrade.sh index 1ad23ed..1104023 100755 --- a/backend/manager/dbscripts/upgrade.sh +++ b/backend/manager/dbscripts/upgrade.sh @@ -44,7 +44,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The username for the database.\n (def. ${USERNAME})\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE}\n" printf "\t-f VERSION - Force upgrading from specified version (def. ${VERSION}\n" printf "\t-c - Force cleaning tasks and compensation info.\n" diff --git a/backend/manager/tools/dbutils/common.sh b/backend/manager/tools/dbutils/common.sh index b5fe298..4205bbe 100755 --- a/backend/manager/tools/dbutils/common.sh +++ b/backend/manager/tools/dbutils/common.sh @@ -5,7 +5,7 @@ SERVERNAME="localhost" PORT="5432" DATABASE="engine" - USERNAME="" + USERNAME="engine" VERBOSE=false LOGFILE="$ME.log" diff --git a/backend/manager/tools/dbutils/encodingvalidator.sh b/backend/manager/tools/dbutils/encodingvalidator.sh index 0c0c50a..00d8f93 100755 --- a/backend/manager/tools/dbutils/encodingvalidator.sh +++ b/backend/manager/tools/dbutils/encodingvalidator.sh @@ -20,7 +20,7 @@ printf "\n" printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-f - Fix the template1 database encoding to be UTF8.\n" printf "\t-v - Turn on verbosity (WARNING: lots of output)\n" diff --git a/backend/manager/tools/dbutils/fkvalidator.sh b/backend/manager/tools/dbutils/fkvalidator.sh index 901f1f5..106807d 100755 --- a/backend/manager/tools/dbutils/fkvalidator.sh +++ b/backend/manager/tools/dbutils/fkvalidator.sh @@ -33,7 +33,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-f - Fix the non consistent data by removing it from DB.\n" printf "\t-v - Turn on verbosity (WARNING: lots of output)\n" diff --git a/backend/manager/tools/dbutils/taskcleaner.sh b/backend/manager/tools/dbutils/taskcleaner.sh index a3afdc6..3452cf8 100755 --- a/backend/manager/tools/dbutils/taskcleaner.sh +++ b/backend/manager/tools/dbutils/taskcleaner.sh @@ -30,7 +30,7 @@ printf "\t-s SERVERNAME - The database servername for the database (def. ${SERVERNAME})\n" printf "\t-p PORT - The database port for the database (def. ${PORT})\n" printf "\t-d DATABASE - The database name (def. ${DATABASE})\n" - printf "\t-u USERNAME - The admin username for the database.\n" + printf "\t-u USERNAME - The username for the database (def. engine)\n" printf "\t-l LOGFILE - The logfile for capturing output (def. ${LOGFILE})\n" printf "\t-t TASK_ID - Removes a task by its Task ID.\n" printf "\t-c COMMAND_ID - Removes all tasks related to the given Command Id.\n" -- To view, visit http://gerrit.ovirt.org/14438 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ae8999dcfad53a1e62613dbff915f76b32e89de Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
