[MediaWiki-commits] [Gerrit] Dependency fixes for new ::aggregator class - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Dependency fixes for new ::aggregator class
......................................................................


Dependency fixes for new ::aggregator class

Change-Id: I265361969751f54a10d7ecd92aaf1e4b0293753f
---
M manifests/misc/statistics.pp
1 file changed, 24 insertions(+), 7 deletions(-)

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



diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index b8bdb8c..9559c3f 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -1108,13 +1108,21 @@
     $user             = $misc::statistics::user::username
     $group            = $misc::statistics::user::username
 
+    file { $working_path:
+        ensure => 'directory',
+        owner  => $user,
+        group  => $group,
+        mode   => '0755'
+    }
+
     git::clone { 'aggregator_code':
         ensure    => 'latest',
         directory => $script_path,
         origin    => 
'https://gerrit.wikimedia.org/r/p/analytics/aggregator.git',
         owner     => $user,
         group     => $group,
-        mode      => '0750',
+        mode      => '0755',
+        require  => File[$working_path],
     }
 
     git::clone { 'aggregator_data':
@@ -1123,23 +1131,31 @@
         origin    => 
'https://gerrit.wikimedia.org/r/p/analytics/aggregator/data.git',
         owner     => $user,
         group     => $group,
-        mode      => '0750',
+        mode      => '0755',
+        require  => File[$working_path],
     }
 
     file { $log_path:
-        ensure => directory,
-        owner  => $user,
-        group  => $group,
-        mode   => '0750',
+        ensure  => 'directory',
+        owner   => $user,
+        group   => $group,
+        mode    => '0755',
+        require  => File[$working_path],
+
     }
 
     # Cron for doing the basic aggregation step itself
     cron { 'aggregator projectcounts aggregate':
         command => "${script_path}/bin/aggregate_projectcounts --source 
${hdfs_source_path} --target ${data_path} --first-date=`date --date='-8 day' 
+\\%Y-\\%m-\\%d` --last-date=`date --date='-1 day' +\\%Y-\\%m-\\%d` 
--push-target --log ${log_path}/`date +\\%Y-\\%m-\\%d--\\%H-\\%M-\\%S`.log",
-        require => File[$log_path],
         user    => $user,
         hour    => '13',
         minute  => '0',
+        require => [
+            Git::Clone['aggregator_code'],
+            Git::Clone['aggregator_data'],
+            File[$data_path],
+            File[$log_path],
+        ],
     }
 
     # Cron for basing monitoring of the aggregated data
@@ -1148,5 +1164,6 @@
         user    => $user,
         hour    => '13',
         minute  => '45',
+        require => Cron['aggregator projectcounts aggregate'],
     }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I265361969751f54a10d7ecd92aaf1e4b0293753f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
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