ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398634 )
Change subject: use cat to recombine gzipped files together
......................................................................
use cat to recombine gzipped files together
Most if not all tools should already support uncompressing such files.
Bug: T182572
Change-Id: I650ceb1caf5963a1b5eb6a955fcf19a14096e1c6
---
M xmldumps-backup/dumps/recombinejobs.py
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
diff --git a/xmldumps-backup/dumps/recombinejobs.py
b/xmldumps-backup/dumps/recombinejobs.py
index 12c49e5..ce5e580 100644
--- a/xmldumps-backup/dumps/recombinejobs.py
+++ b/xmldumps-backup/dumps/recombinejobs.py
@@ -129,11 +129,11 @@
if not len(input_dfnames):
self.set_status("failed")
raise BackupError("No input files for %s found" % self.name())
- if not exists(runner.wiki.config.gzip):
- raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
- compression_command = runner.wiki.config.gzip
- compression_command = "%s > " % runner.wiki.config.gzip
- uncompression_command = ["%s" % runner.wiki.config.gzip, "-dc"]
+ if not exists(runner.wiki.config.cat):
+ raise BackupError("cat command %s not found" %
runner.wiki.config.cat)
+ compression_command = runner.wiki.config.cat
+ compression_command = "%s > " % runner.wiki.config.cat
+ uncompression_command = ["%s" % runner.wiki.config.cat]
recombine_command_string = self.build_recombine_command_string(
runner, input_dfnames, output_dfname, compression_command,
uncompression_command)
recombine_command = [recombine_command_string]
@@ -301,10 +301,10 @@
if not len(input_dfnames):
self.set_status("failed")
raise BackupError("No input files for %s found" % self.name())
- if not exists(runner.wiki.config.gzip):
- raise BackupError("gzip command %s not found" %
runner.wiki.config.gzip)
- compression_command = "%s > " % runner.wiki.config.gzip
- uncompression_command = ["%s" % runner.wiki.config.gzip, "-dc"]
+ if not exists(runner.wiki.config.cat):
+ raise BackupError("cat command %s not found" %
runner.wiki.config.cat)
+ compression_command = "%s > " % runner.wiki.config.cat
+ uncompression_command = ["%s" % runner.wiki.config.cat]
recombine_command_string = self.build_recombine_command_string(
runner, input_dfnames, output_dfname, compression_command,
uncompression_command, "<feed>")
--
To view, visit https://gerrit.wikimedia.org/r/398634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I650ceb1caf5963a1b5eb6a955fcf19a14096e1c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
