Hoo man has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354489 )
Change subject: Use kill -- -$$ to kill a process group in dumpwikidata scripts
......................................................................
Use kill -- -$$ to kill a process group in dumpwikidata scripts
We need to kill the children and the grand children here, not just
the direct children. Sadly pkill only kills the direct children.
I also bumped the minimum expected sizes for the various dumps
based on the size of the last dump run (with 15-20% safety margin)
Change-Id: I0bfd519e877e4686b69cdb92cc7632f793fa0595
---
M modules/snapshot/files/cron/dumpwikidatajson.sh
M modules/snapshot/files/cron/dumpwikidatardf.sh
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/354489/1
diff --git a/modules/snapshot/files/cron/dumpwikidatajson.sh
b/modules/snapshot/files/cron/dumpwikidatajson.sh
index bb184d3..cac00e2 100644
--- a/modules/snapshot/files/cron/dumpwikidatajson.sh
+++ b/modules/snapshot/files/cron/dumpwikidatajson.sh
@@ -36,7 +36,7 @@
echo 1 > $failureFile
# Kill all remaining dumpers and start over.
- pkill -P $$
+ kill -- -$$
fi
) &
let i++
@@ -75,7 +75,7 @@
exit 1
fi
fileSize=`stat --printf="%s" $tempFile`
- if [ $fileSize -lt 1800000000 ]; then
+ if [ $fileSize -lt 2100000000 ]; then
echo "File size of $tempFile is only $fileSize. Aborting." >>
$mainLogFile
exit 1
fi
diff --git a/modules/snapshot/files/cron/dumpwikidatardf.sh
b/modules/snapshot/files/cron/dumpwikidatardf.sh
index bae1fb5..f5c3b2a 100644
--- a/modules/snapshot/files/cron/dumpwikidatardf.sh
+++ b/modules/snapshot/files/cron/dumpwikidatardf.sh
@@ -13,7 +13,7 @@
declare -A dumpNameToFlavor
dumpNameToFlavor=(["all"]="full-dump" ["truthy"]="truthy-dump")
# Sanity check: Minimal size we expect each shard of a certain dump to have
-dumpNameToMinSize=(["all"]=2000000000 ["truthy"]=145000000)
+dumpNameToMinSize=(["all"]=2500000000 ["truthy"]=1500000000)
dumpName=$1
@@ -61,7 +61,7 @@
echo 1 > $failureFile
# Kill all remaining dumpers and start over.
- pkill -P $$
+ kill -- -$$
fi
) &
let i++
--
To view, visit https://gerrit.wikimedia.org/r/354489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bfd519e877e4686b69cdb92cc7632f793fa0595
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man <h...@online.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
