Page MenuHomeSoftware Heritage
Files F7124537

D8419.id30366.diff
No OneTemporary
Actions

D8419.id30366.diff
View Options

diff --git a/site-modules/profile/manifests/swh/deploy/worker/instance.pp b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/instance.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
@@ -6,17 +6,21 @@
# False, the default, for other workers whose recurring tasks are scheduled with
# next-gen scheduler-runner. Their status are updated through a journal client so no
# need for the events.
+# @param sentry_setup
+# True, the default will extract the sentry configuration if any to make workers push
+# their issues to sentry. Define it to false if for some reason, this cannot work.
# @param extra_config
# Extra configuration dict to merge into the default $config loaded for the service.
# Typically, that'd be needed to provide extra sensible information like credentials.
define profile::swh::deploy::worker::instance (
- $ensure = present,
- $instance_name = $title,
- $sentry_name = $title,
- $limit_no_file = undef,
- $private_tmp = undef,
- $merge_policy = 'deep',
- $send_task_events = false,
+ $ensure = present,
+ $instance_name = $title,
+ $sentry_name = $title,
+ $limit_no_file = undef,
+ $private_tmp = undef,
+ $merge_policy = 'deep',
+ $send_task_events = false,
+ $sentry_setup = true,
Hash[String, Any] $extra_config = {},
)
{
@@ -41,9 +45,15 @@
$extra_config
)
- $sentry_dsn = lookup("swh::deploy::${sentry_name}::sentry_dsn", Optional[String], 'first', undef)
- $sentry_environment = lookup("swh::deploy::${sentry_name}::sentry_environment", Optional[String], 'first', undef)
- $sentry_swh_package = lookup("swh::deploy::${sentry_name}::sentry_swh_package", Optional[String], 'first', undef)
+ if $sentry_setup {
+ $sentry_dsn = lookup("swh::deploy::${sentry_name}::sentry_dsn", Optional[String], 'first', undef)
+ $sentry_environment = lookup("swh::deploy::${sentry_name}::sentry_environment", Optional[String], 'first', undef)
+ $sentry_swh_package = lookup("swh::deploy::${sentry_name}::sentry_swh_package", Optional[String], 'first', undef)
+ } else {
+ $sentry_dsn = undef
+ $sentry_environment = undef
+ $sentry_swh_package = undef
+ }
$celery_hostname = $::profile::swh::deploy::worker::base::celery_hostname
diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
@@ -11,6 +11,9 @@
send_task_events => true,
require => Package[$packages],
extra_config => $::profile::swh::deploy::base_loader_git::extra_config,
+ # We need to work on the sentry scaffolding for workers with miscellaneous task types
+ # https://forge.softwareheritage.org/T4513
+ sentry_setup => false,
}
}

File Metadata

Mime Type
text/plain
Expires
Dec 21 2024, 1:06 PM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3231148

Event Timeline

About · Developer information · Legal