Ottomata has submitted this change and it was merged.
Change subject: Update camus runs
......................................................................
Update camus runs
Add run parameter to match script update
Add check parameter to webrequest job
Bug: T113252
Change-Id: I5db0f95859ca52ee2cf4f40ead88f68c66607e5a
---
M manifests/role/analytics/refinery.pp
M modules/camus/manifests/job.pp
2 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/refinery.pp
b/manifests/role/analytics/refinery.pp
index 78283ed..952fbe2 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -63,8 +63,9 @@
}
# Import webrequest_* topics into /wmf/data/raw/webrequest
- # every 10 minutes.
+ # every 10 minutes, check runs and flag fully imported hours.
camus::job { 'webrequest':
+ check => true,
minute => '*/10',
}
diff --git a/modules/camus/manifests/job.pp b/modules/camus/manifests/job.pp
index d6b36dc..8b14f7c 100644
--- a/modules/camus/manifests/job.pp
+++ b/modules/camus/manifests/job.pp
@@ -40,6 +40,7 @@
$script = '/srv/deployment/analytics/refinery/bin/camus',
$user = 'hdfs',
$libjars = undef,
+ $check = undef,
$template = "camus/${title}.erb",
$template_variables = {},
$hour = undef,
@@ -63,7 +64,12 @@
default => "--libjars ${libjars}",
}
- $command = "${script} --job-name camus-${title} ${libjars_opt}
${properties_file} >> ${log_file} 2>&1"
+ $check_opt = $check ? {
+ undef => '',
+ default => "--check",
+ }
+
+ $command = "${script} --run --job-name camus-${title} ${libjars_opt}
${check_opt} ${properties_file} >> ${log_file} 2>&1"
cron { "camus-${title}":
command => $command,
--
To view, visit https://gerrit.wikimedia.org/r/249100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5db0f95859ca52ee2cf4f40ead88f68c66607e5a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Joal <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
