Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: Do not dump/restore privileges ......................................................................
packaging: Do not dump/restore privileges Change-Id: If8e8d9b9d56efeb2ef38b3255b12aa919a942440 Bug-Url: https://bugzilla.redhat.com/1217402 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/bin/engine-backup.sh M packaging/setup/ovirt_engine_setup/engine_common/database.py 2 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/41047/1 diff --git a/packaging/bin/engine-backup.sh b/packaging/bin/engine-backup.sh index 606be7d..e7c69f3 100755 --- a/packaging/bin/engine-backup.sh +++ b/packaging/bin/engine-backup.sh @@ -740,6 +740,7 @@ --disable-triggers \ --format="${format}" \ --no-owner \ + --no-privileges \ 2> "${pgdump_log}" \ | "${compressor}" > "${file}" \ || logdie "${compressor} failed compressing the backup of database ${database}" @@ -750,6 +751,7 @@ --disable-triggers \ --format="${format}" \ --no-owner \ + --no-privileges \ 2> "${pgdump_log}" \ > "${file}" \ || logdie "Database ${database} backup failed" @@ -989,11 +991,11 @@ fi elif [ "${format}" = "custom" ]; then if [ -z "${compressor}" ]; then - pg_cmd pg_restore --no-owner -j "${jobsnum}" "${backupfile}" > "${pgrestorelog}" 2>&1 + pg_cmd pg_restore --no-owner --no-privileges -j "${jobsnum}" "${backupfile}" > "${pgrestorelog}" 2>&1 else # Requires the compressor to support '-d'. All our current ones do. "${compressor}" -d < "${backupfile}" | \ - pg_cmd pg_restore --no-owner > "${pgrestorelog}" 2>&1 + pg_cmd pg_restore --no-owner --no-privileges > "${pgrestorelog}" 2>&1 fi else logdie "Unsupported format ${format}" diff --git a/packaging/setup/ovirt_engine_setup/engine_common/database.py b/packaging/setup/ovirt_engine_setup/engine_common/database.py index 2bb3970..c14ecc6 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/database.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/database.py @@ -595,7 +595,10 @@ if _ind_env(self, DEK.RESTORE_JOBS) and backupfile else [] ) + - ['--no-owner'] + + [ + '--no-owner', + '--no-privileges', + ] + ( [backupfile] if backupfile else [] @@ -612,7 +615,10 @@ ['--file=%s' % backupfile] if backupfile else [] ) + - ['--no-owner'] + + [ + '--no-owner', + '--no-privileges', + ] + [database] ), 'restore_args': ( -- To view, visit https://gerrit.ovirt.org/41047 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8e8d9b9d56efeb2ef38b3255b12aa919a942440 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
