Ottomata has submitted this change and it was merged.

Change subject: update wikibase cronjobs to use wikidata build
......................................................................


update wikibase cronjobs to use wikidata build

setting new ones as absent for time while wikidata
is being switched to new code, and temporarily stop old jobs.

then new cron jobs should be enabled.

Change-Id: I44f16add779b2f38145fe86690df83b233a6d3bf
---
M manifests/misc/maintenance.pp
1 file changed, 40 insertions(+), 30 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 32e60ae..c0775a6 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -213,42 +213,52 @@
 }
 
 class misc::maintenance::wikidata( $enabled = false ) {
-    cron {
-        wikibase-repo-prune:
-            command => "/usr/local/bin/mwscript 
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki wikidatawiki 
--number-of-days=3 2>&1 >> /var/log/wikidata/prune.log",
-            user    => mwdeploy,
-            minute  => [0,15,30,45],
-            ensure  => $enabled ?{
-                true    => present,
-                false   => absent,
-                default => absent
-            };
+
+    $enabled = $::enabled ? {
+        true    => 'present',
+        false   => 'absent',
+        default => 'absent',
+    }
+
+# not enabled yet until wikidata gets switched to new build of Wikibase
+#
+#    cron { 'wikibase-repo-prune2':
+#        # prunes the wb_changes table in wikidatawiki db
+#        command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/pruneChanges.php 
--wiki wikidatawiki --number-of-days=3 2>&1 >> /var/log/wikidata/prune2.log',
+#        user    => 'mwdeploy',
+#        minute  => [0,15,30,45],
+#        ensure  => $enabled,
+#    }
+
+    cron { 'wikibase-repo-prune':
+        ensure => 'absent',
     }
 
     # Run the dispatcher script every 5 minutes
     # This handles inserting jobs into client job queue, which then process 
the changes
-    cron {
-        wikibase-dispatch-changes:
-            command => "/usr/local/bin/mwscript 
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki 
--max-time 900 --batch-size 200 --dispatch-interval 30 2>&1 >> 
/var/log/wikidata/dispatcher.log",
-            user    => mwdeploy,
-            minute  => "*/5",
-            ensure  => $enabled ?{
-                true    => present,
-                false   => absent,
-                default => absent
-            };
+    # not enabled yet until wikidata gets switched to new build of Wikibase
+#    cron { 'wikibase-dispatch-changes3':
+#        # dispatches changes data to wikibase clients (e.g. wikipedia) to be 
processed as jobs there
+#        command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/lib/maintenance/dispatchChanges.php 
--wiki wikidatawiki --max-time 900 --batch-size 200 --dispatch-interval 30 2>&1 
>> /var/log/wikidata/dispatcher3.log',
+#        user    => 'mwdeploy',
+#        minute  => '*/5',
+#        ensure  => $enabled,
+#    }
+
+#    cron { 'wikibase-dispatch-changes4':
+#        # second dispatcher to inject wikidata changes  wikibase clients 
(e.g. wikipedia) to be processed as jobs there
+#        command => '/usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/lib/maintenance/dispatchChanges.php 
--wiki wikidatawiki --max-time 900 --batch-size 200 --dispatch-interval 30 2>&1 
>> /var/log/wikidata/dispatcher4.log',
+#        user    => 'mwdeploy',
+#        minute  => '*/5',
+#        ensure  => $enabled,
+#    }
+
+    cron { 'wikibase-dispatch-changes':
+        ensure => 'absent',
     }
 
-    cron {
-        wikibase-dispatch-changes2:
-            command => "/usr/local/bin/mwscript 
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki 
--max-time 900 --batch-size 200 --dispatch-interval 30 2>&1 >> 
/var/log/wikidata/dispatcher2.log",
-            user    => mwdeploy,
-            minute  => "*/5",
-            ensure  => $enabled ?{
-                true    => present,
-                false   => absent,
-                default => absent
-            };
+    cron { 'wikibase-dispatch-changes2':
+        ensure => 'absent',
     }
 
     cron {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44f16add779b2f38145fe86690df83b233a6d3bf
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Ottomata <o...@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