Skip to content

worker/instance: Allow sentry setup to be deactivated

Antoine R. Dumont requested to merge generated-differential-D8419-source into generated-differential-D8419-target

And deactivate sentry setup on loader high priority to unstuck them as more work is required for the sentry scaffolding to support this kind of workers (mixed loaders within requires rerouting task issue based on their types).

Related to T4513

Test Plan

octo-diff:

$SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff worker01
Found host worker01.softwareheritage.org
WARN     -> Environment "staging-add-prometheus-metrics" contained non-word characters, correcting name to staging_add_prometheus_metrics
WARN     -> Environment "staging-bullseye-rabbitmq-plugin" contained non-word characters, correcting name to staging_bullseye_rabbitmq_plugin
WARN     -> Environment "staging-check-journal-client" contained non-word characters, correcting name to staging_check_journal_client
WARN     -> Environment "staging-check-journal-client-2nd-implementation" contained non-word characters, correcting name to staging_check_journal_client_2nd_implementation
WARN     -> Environment "staging-check-journal-client-first-implem" contained non-word characters, correcting name to staging_check_journal_client_first_implem
WARN     -> Environment "staging-pin" contained non-word characters, correcting name to staging_pin
Cloning into '/tmp/swh-ocd.k3gfRn1P/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.k3gfRn1P/environments/staging/data/private'...
done.
*** Running octocatalog-diff on host worker01.softwareheritage.org
I, [2022-09-08T13:38:20.443061 #2317376]  INFO -- : Catalogs compiled for worker01.softwareheritage.org
I, [2022-09-08T13:38:20.805958 #2317376]  INFO -- : Diffs computed for worker01.softwareheritage.org
diff origin/production/worker01.softwareheritage.org current/worker01.softwareheritage.org
*******************************************
  File[/etc/systemd/system/swh-worker@loader_high_priority.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,7 +6,4 @@
       Environment=MAX_TASKS_PER_CHILD=1
       Environment=LOGLEVEL=info
      -Environment=SWH_SENTRY_DSN=https://@sentry.softwareheritage.org/26
      -Environment=SWH_SENTRY_ENVIRONMENT=production
      -Environment=SWH_MAIN_PACKAGE=swh.loader.highpriority
      _
      _
*******************************************
  Profile::Swh::Deploy::Worker::Instance[checker_deposit] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[lister] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_archive] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_bzr] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_cran] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_debian] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_deposit] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_git] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_high_priority] =>
   parameters =>
     sentry_setup =>
      + false
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_maven] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_mercurial] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_nixguix] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_npm] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_opam] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_pypi] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Profile::Swh::Deploy::Worker::Instance[loader_svn] =>
   parameters =>
     sentry_setup =>
      + true
*******************************************
  Systemd::Dropin_file[swh-worker@loader_high_priority/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,7 +6,4 @@
       Environment=MAX_TASKS_PER_CHILD=1
       Environment=LOGLEVEL=info
      -Environment=SWH_SENTRY_DSN=https://@sentry.softwareheritage.org/26
      -Environment=SWH_SENTRY_ENVIRONMENT=production
      -Environment=SWH_MAIN_PACKAGE=swh.loader.highpriority
      _
      _
*******************************************
*** End octocatalog-diff on worker01.softwareheritage.org

Migrated from D8419 (view on Phabricator)

Merge request reports