bin/octo-diff on worker2 staging (since it got both workers with and without events):
```
% $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging worker2.internal.staging.swh.network
...
*** Running octocatalog-diff on host worker2.internal.staging.swh.network
I, [2021-10-07T18:10:29.998316 #2424639] INFO -- : Catalogs compiled for worker2.internal.staging.swh.network
I, [2021-10-07T18:10:30.307995 #2424639] INFO -- : Diffs computed for worker2.internal.staging.swh.network
diff origin/production/worker2.internal.staging.swh.network current/worker2.internal.staging.swh.network
*******************************************
+ File[/etc/systemd/system/swh-worker-events@lister.service.d/parameters.conf] =>
parameters =>
"ensure": "file"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]"]
"owner": "root"
"selinux_ignore_defaults": false
"show_diff": true
"content": >>>
# Managed by puppet - modifications will be overwritten
# In defined class profile::swh::deploy::worker::instance
[Service]
Environment=CONCURRENCY=5
Environment=MAX_TASKS_PER_CHILD=5
Environment=LOGLEVEL=warning
Environment=SWH_SENTRY_DSN=https://swh::deploy::lister::sentry_token@sentry.softwareheritage.org/6
Environment=SWH_SENTRY_ENVIRONMENT=staging
Environment=SWH_MAIN_PACKAGE=swh.lister
<<<
*******************************************
+ File[/etc/systemd/system/swh-worker-events@lister.service.d] =>
parameters =>
"ensure": "directory"
"group": "root"
"owner": "root"
"purge": true
"recurse": true
"selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/swh-worker-events@lister.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker-events@lister.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker-events@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker-events@loader_high_priority.service.d/parameters.conf] =>
parameters =>
"ensure": "file"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]"]
"owner": "root"
"selinux_ignore_defaults": false
"show_diff": true
"content": >>>
# Managed by puppet - modifications will be overwritten
# In defined class profile::swh::deploy::worker::instance
[Service]
Environment=CONCURRENCY=1
Environment=MAX_TASKS_PER_CHILD=100
Environment=LOGLEVEL=info
<<<
*******************************************
+ File[/etc/systemd/system/swh-worker-events@loader_high_priority.service.d] =>
parameters =>
"ensure": "directory"
"group": "root"
"owner": "root"
"purge": true
"recurse": true
"selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/swh-worker-events@loader_high_priority.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker-events@loader_high_priority.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker-events@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker-events@vault_cooker.service.d/parameters.conf] =>
parameters =>
"ensure": "file"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]"]
"owner": "root"
"selinux_ignore_defaults": false
"show_diff": true
"content": >>>
# Managed by puppet - modifications will be overwritten
# In defined class profile::swh::deploy::worker::instance
[Service]
Environment=CONCURRENCY=20
Environment=MAX_TASKS_PER_CHILD=5
Environment=LOGLEVEL=info
Environment=SWH_SENTRY_DSN=https://swh::deploy::vault::sentry_token@sentry.softwareheritage.org/11
Environment=SWH_SENTRY_ENVIRONMENT=staging
Environment=SWH_MAIN_PACKAGE=swh.vault
<<<
*******************************************
+ File[/etc/systemd/system/swh-worker-events@vault_cooker.service.d] =>
parameters =>
"ensure": "directory"
"group": "root"
"owner": "root"
"purge": true
"recurse": true
"selinux_ignore_defaults": false
*******************************************
+ File[/etc/systemd/system/swh-worker-events@vault_cooker.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker-events@vault_cooker.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker-events@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker-recurring@.service] =>
parameters =>
"ensure": "file"
"group": "root"
"mode": "0444"
"notify": "Class[Systemd::Systemctl::Daemon_reload]"
"owner": "root"
"show_diff": true
"content": >>>
[Unit]
Description=Software Heritage Worker (%i)
After=network.target
[Service]
User=swhworker
Group=swhworker
Type=simple
Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/%i.yml
Environment=SWH_LOG_TARGET=journal
Environment=CONCURRENCY=10
Environment=MAX_TASKS_PER_CHILD=5
Environment=LOGLEVEL=info
Environment=CELERY_HOSTNAME=worker2.internal.staging.swh.network
ExecStart=/usr/bin/python3 -m celery worker -n %i@${CELERY_HOSTNAME} --app=swh.scheduler.celery_backend.config.app --pool=prefork --concurrency=${CONCURRENCY} --maxtasksperchild=${MAX_TASKS_PER_CHILD} -Ofair --loglevel=${LOGLEVEL} --without-gossip --without-mingle --without-heartbeat
KillMode=process
KillSignal=SIGTERM
TimeoutStopSec=15m
OOMPolicy=kill
Restart=always
RestartSec=10
[Install]
WantedBy=multi-user.target
<<<
*******************************************
+ File[/etc/systemd/system/swh-worker@checker_deposit.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@checker_deposit.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
- File[/etc/systemd/system/swh-worker@lister.service.d/parameters.conf]
*******************************************
- File[/etc/systemd/system/swh-worker@lister.service.d]
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_archive.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_archive.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_cran.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_cran.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_debian.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_debian.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_deposit.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_deposit.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_git.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_git.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
- File[/etc/systemd/system/swh-worker@loader_high_priority.service.d/parameters.conf]
*******************************************
- File[/etc/systemd/system/swh-worker@loader_high_priority.service.d]
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_mercurial.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_mercurial.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_nixguix.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_nixguix.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_npm.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_npm.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_opam.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_opam.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_pypi.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_pypi.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ File[/etc/systemd/system/swh-worker@loader_svn.service] =>
parameters =>
"ensure": "link"
"group": "root"
"mode": "0444"
"notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-worker@loader_svn.service]"]
"owner": "root"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
- File[/etc/systemd/system/swh-worker@vault_cooker.service.d/parameters.conf]
*******************************************
- File[/etc/systemd/system/swh-worker@vault_cooker.service.d]
*******************************************
Profile::Swh::Deploy::Worker::Instance[checker_deposit] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[lister] =>
parameters =>
send_task_events =>
+ true
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_archive] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_cran] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_debian] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_deposit] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_git] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_high_priority] =>
parameters =>
send_task_events =>
+ true
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_mercurial] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_nixguix] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_npm] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_opam] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_pypi] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[loader_svn] =>
parameters =>
send_task_events =>
+ false
*******************************************
Profile::Swh::Deploy::Worker::Instance[vault_cooker] =>
parameters =>
send_task_events =>
+ true
*******************************************
+ Service[swh-worker-events@lister.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker-events@lister] =>
parameters =>
"enable": true
*******************************************
+ Service[swh-worker-events@loader_high_priority.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker-events@loader_high_priority] =>
parameters =>
"enable": true
*******************************************
+ Service[swh-worker-events@vault_cooker.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker-events@vault_cooker] =>
parameters =>
"enable": true
*******************************************
+ Service[swh-worker@checker_deposit.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
- Service[swh-worker@lister]
*******************************************
+ Service[swh-worker@loader_archive.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_cran.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_debian.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_deposit.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_git.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
- Service[swh-worker@loader_high_priority]
*******************************************
+ Service[swh-worker@loader_mercurial.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_nixguix.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_npm.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_opam.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_pypi.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
+ Service[swh-worker@loader_svn.service] =>
parameters =>
"enable": true
"provider": "systemd"
*******************************************
- Service[swh-worker@vault_cooker]
*******************************************
+ Systemd::Dropin_file[swh-worker-events@lister/parameters.conf] =>
parameters =>
"daemon_reload": "lazy"
"ensure": "present"
"filename": "parameters.conf"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"selinux_ignore_defaults": false
"show_diff": true
"unit": "swh-worker-events@lister.service"
"content": >>>
# Managed by puppet - modifications will be overwritten
# In defined class profile::swh::deploy::worker::instance
[Service]
Environment=CONCURRENCY=5
Environment=MAX_TASKS_PER_CHILD=5
Environment=LOGLEVEL=warning
Environment=SWH_SENTRY_DSN=https://swh::deploy::lister::sentry_token@sentry.softwareheritage.org/6
Environment=SWH_SENTRY_ENVIRONMENT=staging
Environment=SWH_MAIN_PACKAGE=swh.lister
<<<
*******************************************
+ Systemd::Dropin_file[swh-worker-events@loader_high_priority/parameters.conf] =>
parameters =>
"daemon_reload": "lazy"
"ensure": "present"
"filename": "parameters.conf"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"selinux_ignore_defaults": false
"show_diff": true
"unit": "swh-worker-events@loader_high_priority.service"
"content": >>>
# Managed by puppet - modifications will be overwritten
# In defined class profile::swh::deploy::worker::instance
[Service]
Environment=CONCURRENCY=1
Environment=MAX_TASKS_PER_CHILD=100
Environment=LOGLEVEL=info
<<<
*******************************************
+ Systemd::Dropin_file[swh-worker-events@vault_cooker/parameters.conf] =>
parameters =>
"daemon_reload": "lazy"
"ensure": "present"
"filename": "parameters.conf"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"selinux_ignore_defaults": false
"show_diff": true
"unit": "swh-worker-events@vault_cooker.service"
"content": >>>
# Managed by puppet - modifications will be overwritten
# In defined class profile::swh::deploy::worker::instance
[Service]
Environment=CONCURRENCY=20
Environment=MAX_TASKS_PER_CHILD=5
Environment=LOGLEVEL=info
Environment=SWH_SENTRY_DSN=https://swh::deploy::vault::sentry_token@sentry.softwareheritage.org/11
Environment=SWH_SENTRY_ENVIRONMENT=staging
Environment=SWH_MAIN_PACKAGE=swh.vault
<<<
*******************************************
- Systemd::Dropin_file[swh-worker@lister/parameters.conf]
*******************************************
- Systemd::Dropin_file[swh-worker@loader_high_priority/parameters.conf]
*******************************************
- Systemd::Dropin_file[swh-worker@vault_cooker/parameters.conf]
*******************************************
+ Systemd::Unit_file[swh-worker-events@lister.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker-events@.service"
*******************************************
+ Systemd::Unit_file[swh-worker-events@loader_high_priority.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker-events@.service"
*******************************************
+ Systemd::Unit_file[swh-worker-events@vault_cooker.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker-events@.service"
*******************************************
+ Systemd::Unit_file[swh-worker-recurring@.service] =>
parameters =>
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"content": >>>
[Unit]
Description=Software Heritage Worker (%i)
After=network.target
[Service]
User=swhworker
Group=swhworker
Type=simple
Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/%i.yml
Environment=SWH_LOG_TARGET=journal
Environment=CONCURRENCY=10
Environment=MAX_TASKS_PER_CHILD=5
Environment=LOGLEVEL=info
Environment=CELERY_HOSTNAME=worker2.internal.staging.swh.network
ExecStart=/usr/bin/python3 -m celery worker -n %i@${CELERY_HOSTNAME} --app=swh.scheduler.celery_backend.config.app --pool=prefork --concurrency=${CONCURRENCY} --maxtasksperchild=${MAX_TASKS_PER_CHILD} -Ofair --loglevel=${LOGLEVEL} --without-gossip --without-mingle --without-heartbeat
KillMode=process
KillSignal=SIGTERM
TimeoutStopSec=15m
OOMPolicy=kill
Restart=always
RestartSec=10
[Install]
WantedBy=multi-user.target
<<<
*******************************************
+ Systemd::Unit_file[swh-worker@checker_deposit.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_archive.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_cran.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_debian.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_deposit.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_git.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_mercurial.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_nixguix.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_npm.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_opam.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_pypi.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
+ Systemd::Unit_file[swh-worker@loader_svn.service] =>
parameters =>
"enable": true
"ensure": "present"
"group": "root"
"mode": "0444"
"owner": "root"
"path": "/etc/systemd/system"
"show_diff": true
"target": "/etc/systemd/system/swh-worker@.service"
*******************************************
*** End octocatalog-diff on worker2.internal.staging.swh.network
```