Differential D8042

scrubber: Set objstorage key to noop unused by scrubber services
ClosedPublic
Actions

Authored by ardumont on Jun 28 2022, 9:48 AM.

Details

Reviewers

None

Group Reviewers

System administrators

Commits

rSPSITE7e3d3922e6eb: scrubber: Set objstorage key to noop unused by scrubber services

Summary

As discussed in D8041#208977

Test Plan

No impact on production scrubber as it's already set that way.
Simplify the staging scrubber configuration (and align with the one in production) [1]

[1]

$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging scrubber1.internal.softwareheritage.org
...
*** Running octocatalog-diff on host scrubber1.internal.softwareheritage.org
I, [2022-06-28T09:47:03.831901 #4057974]  INFO -- : Catalogs compiled for scrubber1.internal.softwareheritage.org
I, [2022-06-28T09:47:04.118586 #4057974]  INFO -- : Diffs computed for scrubber1.internal.softwareheritage.org
I, [2022-06-28T09:47:04.118620 #4057974]  INFO -- : No differences
*** End octocatalog-diff on scrubber1.internal.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging scrubber0.internal.staging.swh.network
...
*** Running octocatalog-diff on host scrubber0.internal.staging.swh.network
I, [2022-06-28T09:47:18.538604 #4060441]  INFO -- : Catalogs compiled for scrubber0.internal.staging.swh.network
I, [2022-06-28T09:47:18.817029 #4060441]  INFO -- : Diffs computed for scrubber0.internal.staging.swh.network
diff origin/production/scrubber0.internal.staging.swh.network current/scrubber0.internal.staging.swh.network
*******************************************
  File[/etc/softwareheritage/scrubber/postgres.yml] =>
   parameters =>
     content =>
      @@ -8,9 +8,4 @@
         db: host=db1.internal.staging.swh.network port=5432 user=guest dbname=swh password=guest
         objstorage:
      -    cls: filtered
      -    storage_conf:
      -      cls: remote
      -      url: http://storage1.internal.staging.swh.network:5003/
      -    filters_conf:
      -    - type: readonly
      +    cls: noop
      _
*******************************************
*** End octocatalog-diff on scrubber0.internal.staging.swh.network