Change Details

octo-diff: ``` $ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging storage1.internal.staging.swh.network ... *** Running octocatalog-diff on host storage1.internal.staging.swh.network I, [2022-04-15T12:31:46.788833 #1101397] INFO -- : Catalogs compiled for storage1.internal.staging.swh.network I, [2022-04-15T12:31:47.194547 #1101397] INFO -- : Diffs computed for storage1.internal.staging.swh.network diff origin/production/storage1.internal.staging.swh.network current/storage1.internal.staging.swh.network ******************************************* + File[/etc/softwareheritage/scrubber/postgres.yml] => parameters => "ensure": "present" "group": "swhdev" "mode": "0640" "owner": "swhworker" "content": >>> --- scrubber_db: cls: local db: service=... storage: cls: postgresql db: service=... objstorage: cls: memory <<< ******************************************* + File[/etc/softwareheritage/scrubber] => parameters => "ensure": "present" "group": "swhdev" "owner": "swhworker" ******************************************* + File[/etc/systemd/system/swh-scrubber-checker-postgres@.service] => parameters => "ensure": "file" "group": "root" "mode": "0444" "notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-scrubber-checker-postgres@.service]"] "owner": "root" "show_diff": true "content": >>> # Scrubber checker postgres template unit file # Managed by puppet class profile::swh::deploy::scrubber::checker::postgres # Changes will be overwritten [Unit] Description=Software Heritage Scrubber Checker Postgres %i StartLimitIntervalSec=5min StartLimitBurst=2 After=network.target [Service] Environment=SWH_SENTRY_DSN=https://swh::deploy::scrubber::sentry_token@sentry.softwareheritage.org/23 Environment=SWH_SENTRY_ENVIRONMENT=staging Environment=SWH_MAIN_PACKAGE=swh.scrubber User=swhworker Group=swhdev Type=simple ExecStart=/usr/bin/swh scrubber --config-file storage --object-type --start-object --end-object Restart=always RestartSec=10 [Install] WantedBy=multi-user.target <<< ******************************************* + File[/etc/systemd/system/swh-scrubber.slice] => parameters => "ensure": "file" "group": "root" "mode": "0444" "notify": "Class[Systemd::Systemctl::Daemon_reload]" "owner": "root" "show_diff": true "content": >>> [Unit] Description=SWH Scrubber services [Slice] MemoryMax=75% <<< ******************************************* + Service[swh-scrubber-checker-postgres@.service] => parameters => "enable": false "provider": "systemd" ******************************************* + Service[swh-scrubber-checker-postgres@content_0.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@content_1.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@content_2.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@content_3.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_0.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_1.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_2.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_3.service] => parameters => "enable": false "ensure": "running" ******************************************* + Systemd::Unit_file[swh-scrubber-checker-postgres@.service] => parameters => "enable": false "ensure": "present" "group": "root" "mode": "0444" "owner": "root" "path": "/etc/systemd/system" "show_diff": true "content": >>> # Scrubber checker postgres template unit file # Managed by puppet class profile::swh::deploy::scrubber::checker::postgres # Changes will be overwritten [Unit] Description=Software Heritage Scrubber Checker Postgres %i StartLimitIntervalSec=5min StartLimitBurst=2 After=network.target [Service] Environment=SWH_SENTRY_DSN=https://swh::deploy::scrubber::sentry_token@sentry.softwareheritage.org/23 Environment=SWH_SENTRY_ENVIRONMENT=staging Environment=SWH_MAIN_PACKAGE=swh.scrubber User=swhworker Group=swhdev Type=simple ExecStart=/usr/bin/swh scrubber --config-file storage --object-type --start-object --end-object Restart=always RestartSec=10 [Install] WantedBy=multi-user.target <<< ******************************************* + Systemd::Unit_file[swh-scrubber.slice] => parameters => "ensure": "present" "group": "root" "mode": "0444" "owner": "root" "path": "/etc/systemd/system" "show_diff": true "source": "puppet:///modules/profile/swh/deploy/scrubber/swh-scrubber.slice" ******************************************* *** End octocatalog-diff on storage1.internal.staging.swh.network ```

Actual checks on vagrant vm named 'scrubber0.internal.staging.swh.network': ``` root@scrubber0:/etc/systemd/system# systemctl list-units | grep scrubber ● swh-scrubber-checker-postgres@release-0.service loaded failed failed Software Heritage Scrubber Checker Postgres release-0 ● swh-scrubber-checker-postgres@release-1.service loaded failed failed Software Heritage Scrubber Checker Postgres release-1 ● swh-scrubber-checker-postgres@release-2.service loaded failed failed Software Heritage Scrubber Checker Postgres release-2 ● swh-scrubber-checker-postgres@release-3.service loaded failed failed Software Heritage Scrubber Checker Postgres release-3 system-swh\x2dscrubber\x2dchecker\x2dpostgres.slice loaded active active system-swh\x2dscrubber\x2dchecker\x2dpostgres.slice root@scrubber0:/etc/systemd/system# systemctl cat swh-scrubber-checker-postgres@release-0 # /etc/systemd/system/swh-scrubber-checker-postgres@.service # Scrubber checker postgres template unit file # Managed by puppet class profile::swh::deploy::scrubber::checker::postgres # Changes will be overwritten [Unit] Description=Software Heritage Scrubber Checker Postgres %i After=network.target [Service] Environment=SWH_SENTRY_DSN=https://swh::deploy::scrubber::sentry_token@sentry.softwareheritage.org/23 Environment=SWH_SENTRY_ENVIRONMENT=staging Environment=SWH_MAIN_PACKAGE=swh.scrubber Environment=SWH_SCRUBBER_CLI_EXTRA_ARGS="--help" User=swhworker Group=swhdev Type=simple ExecStart=/usr/bin/swh scrubber --config-file /etc/softwareheritage/scrubber/postgres.yml check storage ${SWH_SCRUBBER_CLI_EXTRA_ARGS} [Install] WantedBy=multi-user.target # /etc/systemd/system/swh-scrubber-checker-postgres@release-0.service.d/parameters.conf # Managed by puppet class profile::swh::deploy::scrubber::checker::postgres # Modifications will be overwritten [Service] Environment=SWH_SCRUBBER_CLI_EXTRA_ARGS="--object-type release --start-object 00000000000000000000 --end-object 44444444444444444444" ``` no more octo-diff since that needs to run in a new node.

octo-diff:Actual checks on vagrant vm named 'scrubber0.internal.staging.swh.network': ``` $ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging storage1.internal.staging.swh.networkroot@scrubber0:/etc/systemd/system# systemctl list-units | grep scrubber ...● swh-scrubber-checker-postgres@release-0.service loaded failed failed Software Heritage Scrubber Checker Postgres release-0 *** Running octocatalog-diff on host storage1.internal.staging.swh.network● swh-scrubber-checker-postgres@release-1.service loaded failed failed Software Heritage Scrubber Checker Postgres release-1 I, [2022-04-15T12:31:46.788833 #1101397] INFO -- : Catalogs compiled for storage1.internal.staging.swh.network● swh-scrubber-checker-postgres@release-2.service loaded failed failed Software Heritage Scrubber Checker Postgres release-2 I, [2022-04-15T12:31:47.194547 #1101397] INFO -- : Diffs computed for storage1.internal.staging.swh.network diff origin/production/storage1.internal.staging.swh.network current/storage1.internal.staging.swh.network ******************************************* + File[/etc/softwareheritage/scrubber/postgres.yml] => parameters => "ensure": "present" "group": "swhdev" "mode": "0640" "owner": "swhworker" "content": >>> --- scrubber_db: cls: local db: service=... storage: cls: postgresql db: service=...● swh-scrubber-checker-postgres@release-3.service loaded failed failed Software Heritage Scrubber Checker Postgres release-3 objstorage: cls: memory <<< ******************************************* + File[/etc/softwareheritage/scrubber] => parameters => "ensure": "present" "group": "swhdev" "owner": "swhworker" ******************************************* + File[/etc/systemd/system/swh-scrubber-checker-postgres@.service] => parameters => "ensure": "file" "group": "root" "mode": "0444" "notify": ["Class[Systemd::Systemctl::Daemon_reload]", "Service[swh-scrubber-checker-postgres@.service]"] "owner": "root" "show_diff": truesystem-swh\x2dscrubber\x2dchecker\x2dpostgres.slice loaded active active system-swh\x2dscrubber\x2dchecker\x2dpostgres.slice root@scrubber0:/etc/systemd/system# systemctl cat swh-scrubber-checker-postgres@release-0 "content": >>># /etc/systemd/system/swh-scrubber-checker-postgres@.service # Scrubber checker postgres template unit file # Managed by puppet class profile::swh::deploy::scrubber::checker::postgres # Changes will be overwritten [Unit] Description=Software Heritage Scrubber Checker Postgres %i StartLimitIntervalSec=5min StartLimitBurst=2 After=network.target [Service] Environment=SWH_SENTRY_DSN=https://swh::deploy::scrubber::sentry_token@sentry.softwareheritage.org/23 Environment=SWH_SENTRY_ENVIRONMENT=staging Environment=SWH_MAIN_PACKAGE=swh.scrubber Environment=SWH_SCRUBBER_CLI_EXTRA_ARGS="--help" User=swhworker Group=swhdev Type=simple ExecStart=/usr/bin/swh scrubber --config-file storage --object-type --start-object --end-object Restart=always RestartSec=10/etc/softwareheritage/scrubber/postgres.yml check storage ${SWH_SCRUBBER_CLI_EXTRA_ARGS} [Install] WantedBy=multi-user.target <<< ******************************************* + File[/etc/systemd/system/swh-scrubber.slice] => parameters => "ensure": "file" "group": "root" "mode": "0444" "notify": "Class[Systemd::Systemctl::Daemon_reload]" "owner": "root" "show_diff": true "content": >>> [Unit] Description=SWH Scrubber services [Slice] MemoryMax=75% <<< ******************************************* + Service[swh-scrubber-checker-postgres@.service] => parameters => "enable": false "provider": "systemd" ******************************************* + Service[swh-scrubber-checker-postgres@content_0.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@content_1.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@content_2.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@content_3.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_0.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_1.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_2.service] => parameters => "enable": false "ensure": "running" ******************************************* + Service[swh-scrubber-checker-postgres@release_3.service] => parameters => "enable": false "ensure": "running" ******************************************* + Systemd::Unit_file[swh-scrubber-checker-postgres@.service] => parameters => "enable": false "ensure": "present" "group": "root" "mode": "0444" "owner": "root" "path": "/etc/systemd/system" "show_diff": true "content": >>> # Scrubber checker postgres template unit file# /etc/systemd/system/swh-scrubber-checker-postgres@release-0.service.d/parameters.conf # Managed by puppet class profile::swh::deploy::scrubber::checker::postgres # Changes will be overwritten [Unit] Description=Software Heritage Scrubber Checker Postgres %i StartLimitIntervalSec=5min StartLimitBurst=2 After=network.targetModifications will be overwritten [Service] Environment=SWH_SENTRY_DSN=https://swh::deploy::scrubber::sentry_token@sentry.softwareheritage.org/23 Environment=SWH_SENTRY_ENVIRONMENT=staging Environment=SWH_MAIN_PACKAGE=swh.scrubber User=swhworker Group=swhdev Type=simple ExecStart=/usr/bin/swh scrubber --config-file storage --object-type --start-object --end-objectCRUBBER_CLI_EXTRA_ARGS="--object-type release --start-object 00000000000000000000 --end-object 44444444444444444444" Restart=always RestartSec=10``` [Install] WantedBy=multi-user.target <<< ******************************************* + Systemd::Unit_file[swh-scrubber.slice] => parameters => "ensure": "present"no more octo-diff since that needs to run in a new node. "group": "root" "mode": "0444" "owner": "root" "path": "/etc/systemd/system" "show_diff": true "source": "puppet:///modules/profile/swh/deploy/scrubber/swh-scrubber.slice" ******************************************* *** End octocatalog-diff on storage1.internal.staging.swh.network ```