Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: engine-backup: Fix changing owner ......................................................................
packaging: engine-backup: Fix changing owner Ignore errors while trying to set owner to previous db user. Change-Id: Ifc864805217cbd30b3c3b97f3be342825edc98f7 Bug-Url: https://bugzilla.redhat.com/1121961 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/bin/engine-backup.sh 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/36150/1 diff --git a/packaging/bin/engine-backup.sh b/packaging/bin/engine-backup.sh index ef0345c..e9d2503 100755 --- a/packaging/bin/engine-backup.sh +++ b/packaging/bin/engine-backup.sh @@ -231,6 +231,7 @@ MY_DB_HOST= MY_DB_PORT=5432 MY_DB_USER= +ORIG_DB_USER= MY_DB_PASSWORD="${OVIRT_ENGINE_DATABASE_PASSWORD}" MY_DB_DATABASE= MY_DB_SECURED=False @@ -240,6 +241,7 @@ MY_DWH_DB_HOST= MY_DWH_DB_PORT=5432 MY_DWH_DB_USER= +ORIG_DWH_DB_USER= MY_DWH_DB_PASSWORD="${OVIRT_DWH_DATABASE_PASSWORD}" MY_DWH_DB_DATABASE= MY_DWH_DB_SECURED=False @@ -249,6 +251,7 @@ MY_REPORTS_DB_HOST= MY_REPORTS_DB_PORT=5432 MY_REPORTS_DB_USER= +ORIG_REPORTS_DB_USER= MY_REPORTS_DB_PASSWORD="${OVIRT_REPORTS_DATABASE_PASSWORD}" MY_REPORTS_DB_DATABASE= MY_REPORTS_DB_SECURED=False @@ -294,6 +297,7 @@ ;; --db-user=*) MY_DB_USER="${v}" + ORIG_DB_USER="${ENGINE_DB_USER}" ;; --db-passfile=*) DB_PASSFILE="${v}" @@ -327,6 +331,7 @@ ;; --dwh-db-user=*) MY_DWH_DB_USER="${v}" + ORIG_DWH_DB_USER="${DWH_DB_USER}" ;; --dwh-db-passfile=*) DB_PASSFILE="${v}" @@ -360,6 +365,7 @@ ;; --reports-db-user=*) MY_REPORTS_DB_USER="${v}" + ORIG_REPORTS_DB_USER="${REPORTS_DB_USER}" ;; --reports-db-passfile=*) DB_PASSFILE="${v}" @@ -601,17 +607,17 @@ if [ -n "${SCOPE_ENGINE_DB}" -a -n "${ENGINE_DB_USER}" ]; then output "- Engine database '"${ENGINE_DB_DATABASE}"'" log "Restoring engine database backup at ${TEMP_FOLDER}/db/${DB_BACKUP_FILE_NAME}" - restoreDB "${TEMP_FOLDER}/db/${DB_BACKUP_FILE_NAME}" "${ENGINE_DB_USER}" "${ENGINE_DB_HOST}" "${ENGINE_DB_PORT}" "${ENGINE_DB_DATABASE}" + restoreDB "${TEMP_FOLDER}/db/${DB_BACKUP_FILE_NAME}" "${ENGINE_DB_USER}" "${ENGINE_DB_HOST}" "${ENGINE_DB_PORT}" "${ENGINE_DB_DATABASE}" "${ORIG_DB_USER}" fi if [ -n "${SCOPE_DWH_DB}" -a -n "${DWH_DB_USER}" ]; then output "- DWH database '"${DWH_DB_DATABASE}"'" log "Restoring dwh database backup at ${TEMP_FOLDER}/db/${DWHDB_BACKUP_FILE_NAME}" - restoreDB "${TEMP_FOLDER}/db/${DWHDB_BACKUP_FILE_NAME}" "${DWH_DB_USER}" "${DWH_DB_HOST}" "${DWH_DB_PORT}" "${DWH_DB_DATABASE}" + restoreDB "${TEMP_FOLDER}/db/${DWHDB_BACKUP_FILE_NAME}" "${DWH_DB_USER}" "${DWH_DB_HOST}" "${DWH_DB_PORT}" "${DWH_DB_DATABASE}" "${ORIG_DWH_DB_USER}" fi if [ -n "${SCOPE_REPORTS_DB}" -a -n "${REPORTS_DB_USER}" ]; then output "- Reports database '"${REPORTS_DB_DATABASE}"'" log "Restoring REPORTS database backup at ${TEMP_FOLDER}/db/${REPORTSDB_BACKUP_FILE_NAME}" - restoreDB "${TEMP_FOLDER}/db/${REPORTSDB_BACKUP_FILE_NAME}" "${REPORTS_DB_USER}" "${REPORTS_DB_HOST}" "${REPORTS_DB_PORT}" "${REPORTS_DB_DATABASE}" + restoreDB "${TEMP_FOLDER}/db/${REPORTSDB_BACKUP_FILE_NAME}" "${REPORTS_DB_USER}" "${REPORTS_DB_HOST}" "${REPORTS_DB_PORT}" "${REPORTS_DB_DATABASE}" "${ORIG_REPORTS_DB_USER}" fi [ -n "${CHANGE_DB_CREDENTIALS}" ] && changeEngineDBConf [ -n "${CHANGE_DWH_DB_CREDENTIALS}" ] && changeDwhDBConf @@ -676,6 +682,8 @@ local host="$3" local port="$4" local database="$5" + local orig_user="$6" + log "restoreDB: backupfile ${backupfile} user ${user} host ${host} port ${port} database ${database} orig_user ${orig_user}" local psqllog="${TEMP_FOLDER}/psql-restore-log" bz_cat "${backupfile}" | \ PGPASSFILE="${MYPGPASS}" psql \ @@ -684,7 +692,7 @@ -h "${host}" \ -p "${port}" \ -d "${database}" \ - >> "${psqllog}" 2>&1 \ + > "${psqllog}" 2>&1 \ || logdie "Database ${database} restore failed" cat "${psqllog}" >> "${LOG}" 2>&1 \ @@ -708,6 +716,8 @@ function public.uuid_ns_oid\(\) does not exist function public.uuid_ns_url\(\) does not exist function public.uuid_ns_x500\(\) does not exist +# Ignore error when trying to set owner to changed user +role "$orig_user" does not exist __EOF ) local numerrors=$(grep 'ERROR: ' "${psqllog}" | grep -Ev "${IGNORED_ERRORS}" | wc -l) -- To view, visit http://gerrit.ovirt.org/36150 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc864805217cbd30b3c3b97f3be342825edc98f7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
