Sandro Bonazzola has uploaded a new change for review. Change subject: sos: postgresql: changed dump format to sql ......................................................................
sos: postgresql: changed dump format to sql Changed pg_dump format from tar to sql: it will make the restore process easier. Bug-Url: https://bugzilla.redhat.com/975012 Change-Id: Ib8b406b58effbba28477cf5edd4809b107866e2b Signed-off-by: Sandro Bonazzola <[email protected]> --- M src/sos/plugins/postgresql.py 1 file changed, 33 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/96/15796/1 diff --git a/src/sos/plugins/postgresql.py b/src/sos/plugins/postgresql.py index a20bf55..b3386e4 100644 --- a/src/sos/plugins/postgresql.py +++ b/src/sos/plugins/postgresql.py @@ -62,25 +62,47 @@ self.tmp_dir = None def pg_dump(self): - dest_file = os.path.join(self.tmp_dir, "sos_pgdump.tar") + dest_file = os.path.join(self.tmp_dir, "sos_pgdump.sql") old_env_pgpassword = os.environ.get("PGPASSWORD") os.environ["PGPASSWORD"] = "%s" % (self.getOption("password")) if ( self.getOption("dbhost") and self.getOption("dbhost") is not True ): - cmd = "pg_dump -U %s -h %s -p %s -w -f %s -F t %s" % ( - self.__username, - self.getOption("dbhost"), - self.__dbport, - dest_file, - self.getOption("dbname") + cmd = ( + 'pg_dump ' + '--encoding=UTF8 ' + '--disable-dollar-quoting ' + '--disable-triggers ' + '--format=p ' + '--no-password ' + '--host {servername} ' + '--port {port} ' + '--username {username} ' + '--file {filename} ' + '{database}' + ).format( + username=self.__username, + servername=self.getOption("dbhost"), + port=self.__dbport, + filename=dest_file, + database=self.getOption("dbname") ) else: - cmd = "pg_dump -C -U %s -w -f %s -F t %s " % ( - self.__username, - dest_file, - self.getOption("dbname") + cmd = ( + 'pg_dump ' + '--encoding=UTF8 ' + '--disable-dollar-quoting ' + '--disable-triggers ' + '--format=p ' + '--no-password ' + '--username {username} ' + '--file {filename} ' + '{database}' + ).format( + username=self.__username, + filename=dest_file, + database=self.getOption("dbname") ) self.soslog.debug("calling %s" % cmd) (status, output, rtime) = self.callExtProg(cmd) -- To view, visit http://gerrit.ovirt.org/15796 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8b406b58effbba28477cf5edd4809b107866e2b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
