ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395474 )
Change subject: fix subdir name in misc dumps cleanup, make script quieter
......................................................................
fix subdir name in misc dumps cleanup, make script quieter
Change-Id: If566f0b929f05facbacdad362a947af767c1f4be
---
M modules/dumps/files/web/cleanups/cleanup_old_miscdumps.sh
M modules/dumps/manifests/web/cleanups/miscdumps.pp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/395474/1
diff --git a/modules/dumps/files/web/cleanups/cleanup_old_miscdumps.sh
b/modules/dumps/files/web/cleanups/cleanup_old_miscdumps.sh
index e410b7d..7a13650 100644
--- a/modules/dumps/files/web/cleanups/cleanup_old_miscdumps.sh
+++ b/modules/dumps/files/web/cleanups/cleanup_old_miscdumps.sh
@@ -75,7 +75,7 @@
continue
fi
- runs=$( cd "$subdir"; ls -d [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] | sort )
+ runs=$( cd "$subdir"; ls -d [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]
2>/dev/null | sort )
if [ -z "$runs" ]; then
continue
fi
diff --git a/modules/dumps/manifests/web/cleanups/miscdumps.pp
b/modules/dumps/manifests/web/cleanups/miscdumps.pp
index 17590c9..5a4531c 100644
--- a/modules/dumps/manifests/web/cleanups/miscdumps.pp
+++ b/modules/dumps/manifests/web/cleanups/miscdumps.pp
@@ -11,9 +11,9 @@
source =>
'puppet:///modules/dumps/web/cleanups/cleanup_old_miscdumps.sh',
}
- $keep_generator=['categories_rdf:3', 'cirrussearch:3',
'contenttranslation:3', 'globalblocks:3', 'imageinfo:3', 'mediatitles:3',
'pagetitles:3', 'wikibase/wikidatawiki:3']
+ $keep_generator=['categoriesrdf:3', 'cirrussearch:3',
'contenttranslation:3', 'globalblocks:3', 'imageinfo:3', 'mediatitles:3',
'pagetitles:3', 'wikibase/wikidatawiki:3']
# FIXME check for imageinfo, mediatitles, pagetitles that we really
want/need all those
- $keep_replicas=['categories_rdf:11', 'cirrussearch:11',
'contenttranslation:14', 'globalblocks:13', 'imageinfo:32', 'mediatitles:90',
'pagetitles:90', 'wikibase/wikidatawiki:20']
+ $keep_replicas=['categoriesrdf:11', 'cirrussearch:11',
'contenttranslation:14', 'globalblocks:13', 'imageinfo:32', 'mediatitles:90',
'pagetitles:90', 'wikibase/wikidatawiki:20']
if ($isreplica == true) {
$content= join($keep_replicas, "\n")
} else {
--
To view, visit https://gerrit.wikimedia.org/r/395474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If566f0b929f05facbacdad362a947af767c1f4be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
