ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333901 )

Change subject: Log time and shard number on Wikidata dump failure
......................................................................


Log time and shard number on Wikidata dump failure

Might be useful for debugging.

Change-Id: I9236f7f11be4cd51ffd83ce2b4818e7d80f5967b
---
M modules/snapshot/files/cron/dumpwikidatajson.sh
M modules/snapshot/files/cron/dumpwikidatattl.sh
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/snapshot/files/cron/dumpwikidatajson.sh 
b/modules/snapshot/files/cron/dumpwikidatajson.sh
index e7144ae..fddfd8e 100644
--- a/modules/snapshot/files/cron/dumpwikidatajson.sh
+++ b/modules/snapshot/files/cron/dumpwikidatajson.sh
@@ -32,7 +32,7 @@
                        php $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpJson.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --snippet 2>> $errorLog | 
gzip > $tempDir/wikidataJson.$i.gz
                        exitCode=$?
                        if [ $exitCode -gt 0 ]; then
-                               echo -e "\n\nProcess failed with exit code 
$exitCode" >> $errorLog
+                               echo -e "\n\n(`date --iso-8601=minutes`) 
Process for shard $i failed with exit code $exitCode" >> $errorLog
                                echo 1 > $failureFile
 
                                #  Kill all remaining dumpers and start over.
@@ -49,7 +49,7 @@
                rm -f $failureFile
                rm -f $tempDir/wikidataJson.*.gz
                let retries++
-               echo "Dumping one or more shards failed. Retrying." >> 
$mainLogFile
+               echo "(`date --iso-8601=minutes`) Dumping one or more shards 
failed. Retrying." >> $mainLogFile
 
                if [ $retries -eq 3 ]; then
                        exit 1
diff --git a/modules/snapshot/files/cron/dumpwikidatattl.sh 
b/modules/snapshot/files/cron/dumpwikidatattl.sh
index d1a2c4d..682e2c8 100644
--- a/modules/snapshot/files/cron/dumpwikidatattl.sh
+++ b/modules/snapshot/files/cron/dumpwikidatattl.sh
@@ -32,7 +32,7 @@
                        php $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpRdf.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --format ttl 2>> $errorLog | 
gzip > $tempDir/wikidataTTL.$i.gz
                        exitCode=$?
                        if [ $exitCode -gt 0 ]; then
-                               echo -e "\n\nProcess failed with exit code 
$exitCode" >> $errorLog
+                               echo -e "\n\n(`date --iso-8601=minutes`) 
Process for shard $i failed with exit code $exitCode" >> $errorLog
                                echo 1 > $failureFile
 
                                #  Kill all remaining dumpers and start over.
@@ -49,7 +49,7 @@
                rm -f $failureFile
                rm -f $tempDir/wikidataTTL.*.gz
                let retries++
-               echo "Dumping one or more shards failed. Retrying." >> 
$mainLogFile
+               echo "(`date --iso-8601=minutes`) Dumping one or more shards 
failed. Retrying." >> $mainLogFile
 
                if [ $retries -eq 3 ]; then
                        exit 1

-- 
To view, visit https://gerrit.wikimedia.org/r/333901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9236f7f11be4cd51ffd83ce2b4818e7d80f5967b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to