Page MenuHomeSoftware Heritage

Drop args key from all service backend instantiations
ClosedPublic

Authored by olasd on Wed, Jun 22, 4:23 PM.

Details

Summary

This has been deprecated for ages

Test Plan

octocatalog-diff on saam and storage1@staging:

filetype=diff
*** Running octocatalog-diff on host saam.internal.softwareheritage.org
I, [2022-06-22T16:20:27.014949 #44544]  INFO -- : Catalogs compiled for saam.internal.softwareheritage.org
I, [2022-06-22T16:20:27.433982 #44544]  INFO -- : Diffs computed for saam.internal.softwareheritage.org
diff origin/production/saam.internal.softwareheritage.org current/saam.internal.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/objstorage/server.yml] =>
   parameters =>
     content =>
      @@ -2,21 +2,17 @@
       objstorage:
         cls: multiplexer
      -  args:
      -    objstorages:
      -    - cls: pathslicing
      -      args:
      -        root: "/srv/softwareheritage/objects"
      -        slicing: 0:2/0:5
      -        compression: none
      -    - cls: filtered
      -      args:
      -        storage_conf:
      -          cls: pathslicing
      -          args:
      -            root: "/srv/softwareheritage/objects-xfs"
      -            slicing: 0:1/0:2/2:4/4:6
      -            compression: gzip
      -        filters_conf:
      -        - type: readonly
      +  objstorages:
      +  - cls: pathslicing
      +    root: "/srv/softwareheritage/objects"
      +    slicing: 0:2/0:5
      +    compression: none
      +  - cls: filtered
      +    storage_conf:
      +      cls: pathslicing
      +      root: "/srv/softwareheritage/objects-xfs"
      +      slicing: 0:1/0:2/2:4/4:6
      +      compression: gzip
      +    filters_conf:
      +    - type: readonly
       client_max_size: 1073741824
      _
*******************************************
  File[/etc/softwareheritage/storage/storage.yml] =>
   parameters =>
     content =>
      @@ -2,105 +2,98 @@
       storage:
         cls: local
      -  args:
      -    db: host=db.internal.softwareheritage.org user=swhstorage dbname=softwareheritage
      -      password=swh-deploy-storage-db-password
      -    objstorage:
      -      cls: multiplexer
      -      args:
      -        objstorages:
      -        - cls: pathslicing
      -          args:
      -            root: "/srv/softwareheritage/objects"
      -            slicing: 0:2/0:5
      -            compression: none
      -        - cls: filtered
      -          args:
      -            storage_conf:
      -              cls: pathslicing
      -              args:
      -                root: "/srv/softwareheritage/objects-xfs"
      -                slicing: 0:1/0:2/2:4/4:6
      -                compression: gzip
      -            filters_conf:
      -            - type: readonly
      -        - cls: azure-prefixed
      -          args:
      -            accounts:
      -              '0':
      -                account_name: 0euwestswh
      -                api_secret_key: swh::azure::credentials::0euwestswh
      -                container_name: contents
      -              '1':
      -                account_name: 1euwestswh
      -                api_secret_key: swh::azure::credentials::1euwestswh
      -                container_name: contents
      -              '2':
      -                account_name: 2euwestswh
      -                api_secret_key: swh::azure::credentials::2euwestswh
      -                container_name: contents
      -              '3':
      -                account_name: 3euwestswh
      -                api_secret_key: swh::azure::credentials::3euwestswh
      -                container_name: contents
      -              '4':
      -                account_name: 4euwestswh
      -                api_secret_key: swh::azure::credentials::4euwestswh
      -                container_name: contents
      -              '5':
      -                account_name: 5euwestswh
      -                api_secret_key: swh::azure::credentials::5euwestswh
      -                container_name: contents
      -              '6':
      -                account_name: 6euwestswh
      -                api_secret_key: swh::azure::credentials::6euwestswh
      -                container_name: contents
      -              '7':
      -                account_name: 7euwestswh
      -                api_secret_key: swh::azure::credentials::7euwestswh
      -                container_name: contents
      -              '8':
      -                account_name: 8euwestswh
      -                api_secret_key: swh::azure::credentials::8euwestswh
      -                container_name: contents
      -              '9':
      -                account_name: 9euwestswh
      -                api_secret_key: swh::azure::credentials::9euwestswh
      -                container_name: contents
      -              a:
      -                account_name: aeuwestswh
      -                api_secret_key: swh::azure::credentials::aeuwestswh
      -                container_name: contents
      -              b:
      -                account_name: beuwestswh
      -                api_secret_key: swh::azure::credentials::beuwestswh
      -                container_name: contents
      -              c:
      -                account_name: ceuwestswh
      -                api_secret_key: swh::azure::credentials::ceuwestswh
      -                container_name: contents
      -              d:
      -                account_name: deuwestswh
      -                api_secret_key: swh::azure::credentials::deuwestswh
      -                container_name: contents
      -              e:
      -                account_name: eeuwestswh
      -                api_secret_key: swh::azure::credentials::eeuwestswh
      -                container_name: contents
      -              f:
      -                account_name: feuwestswh
      -                api_secret_key: swh::azure::credentials::feuwestswh
      -                container_name: contents
      -    journal_writer:
      -      cls: kafka
      -      args:
      -        brokers:
      -        - kafka1.internal.softwareheritage.org
      -        - kafka2.internal.softwareheritage.org
      -        - kafka3.internal.softwareheritage.org
      -        - kafka4.internal.softwareheritage.org
      -        prefix: swh.journal.objects
      -        client_id: swh.storage.journal_writer.saam
      -        anonymize: true
      -        producer_config:
      -          message.max.bytes: 1000000000
      +  db: host=db.internal.softwareheritage.org user=swhstorage dbname=softwareheritage
      +    password=swh-deploy-storage-db-password
      +  journal_writer:
      +    cls: kafka
      +    brokers:
      +    - kafka1.internal.softwareheritage.org
      +    - kafka2.internal.softwareheritage.org
      +    - kafka3.internal.softwareheritage.org
      +    - kafka4.internal.softwareheritage.org
      +    prefix: swh.journal.objects
      +    client_id: swh.storage.journal_writer.saam
      +    anonymize: true
      +    producer_config:
      +      message.max.bytes: 1000000000
      +  objstorage:
      +    cls: multiplexer
      +    objstorages:
      +    - cls: pathslicing
      +      root: "/srv/softwareheritage/objects"
      +      slicing: 0:2/0:5
      +      compression: none
      +    - cls: filtered
      +      storage_conf:
      +        cls: pathslicing
      +        root: "/srv/softwareheritage/objects-xfs"
      +        slicing: 0:1/0:2/2:4/4:6
      +        compression: gzip
      +      filters_conf:
      +      - type: readonly
      +    - cls: azure-prefixed
      +      accounts:
      +        '0':
      +          account_name: 0euwestswh
      +          api_secret_key: swh::azure::credentials::0euwestswh
      +          container_name: contents
      +        '1':
      +          account_name: 1euwestswh
      +          api_secret_key: swh::azure::credentials::1euwestswh
      +          container_name: contents
      +        '2':
      +          account_name: 2euwestswh
      +          api_secret_key: swh::azure::credentials::2euwestswh
      +          container_name: contents
      +        '3':
      +          account_name: 3euwestswh
      +          api_secret_key: swh::azure::credentials::3euwestswh
      +          container_name: contents
      +        '4':
      +          account_name: 4euwestswh
      +          api_secret_key: swh::azure::credentials::4euwestswh
      +          container_name: contents
      +        '5':
      +          account_name: 5euwestswh
      +          api_secret_key: swh::azure::credentials::5euwestswh
      +          container_name: contents
      +        '6':
      +          account_name: 6euwestswh
      +          api_secret_key: swh::azure::credentials::6euwestswh
      +          container_name: contents
      +        '7':
      +          account_name: 7euwestswh
      +          api_secret_key: swh::azure::credentials::7euwestswh
      +          container_name: contents
      +        '8':
      +          account_name: 8euwestswh
      +          api_secret_key: swh::azure::credentials::8euwestswh
      +          container_name: contents
      +        '9':
      +          account_name: 9euwestswh
      +          api_secret_key: swh::azure::credentials::9euwestswh
      +          container_name: contents
      +        a:
      +          account_name: aeuwestswh
      +          api_secret_key: swh::azure::credentials::aeuwestswh
      +          container_name: contents
      +        b:
      +          account_name: beuwestswh
      +          api_secret_key: swh::azure::credentials::beuwestswh
      +          container_name: contents
      +        c:
      +          account_name: ceuwestswh
      +          api_secret_key: swh::azure::credentials::ceuwestswh
      +          container_name: contents
      +        d:
      +          account_name: deuwestswh
      +          api_secret_key: swh::azure::credentials::deuwestswh
      +          container_name: contents
      +        e:
      +          account_name: eeuwestswh
      +          api_secret_key: swh::azure::credentials::eeuwestswh
      +          container_name: contents
      +        f:
      +          account_name: feuwestswh
      +          api_secret_key: swh::azure::credentials::feuwestswh
      +          container_name: contents
      _
*******************************************
*** End octocatalog-diff on saam.internal.softwareheritage.org
*** Running octocatalog-diff on host storage1.internal.staging.swh.network
I, [2022-06-22T16:20:32.671396 #44599]  INFO -- : Catalogs compiled for storage1.internal.staging.swh.network
I, [2022-06-22T16:20:33.147587 #44599]  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/journal/backfill.yml] =>
   parameters =>
     content =>
      @@ -7,11 +7,10 @@
       journal_writer:
         cls: kafka
      -  args:
      -    brokers:
      -    - journal1.internal.staging.swh.network
      -    prefix: swh.journal.objects
      -    client_id: swh.storage.journal_writer.storage1
      -    anonymize: true
      -    producer_config:
      -      message.max.bytes: 1000000000
      +  brokers:
      +  - journal1.internal.staging.swh.network
      +  prefix: swh.journal.objects
      +  client_id: swh.storage.journal_writer.storage1
      +  anonymize: true
      +  producer_config:
      +    message.max.bytes: 1000000000
      _
*******************************************
  File[/etc/softwareheritage/objstorage/server.yml] =>
   parameters =>
     content =>
      @@ -2,7 +2,6 @@
       objstorage:
         cls: pathslicing
      -  args:
      -    root: "/srv/softwareheritage/objects"
      -    slicing: 0:1/1:5
      +  root: "/srv/softwareheritage/objects"
      +  slicing: 0:1/1:5
       client_max_size: 1073741824
      _
*******************************************
  File[/etc/softwareheritage/storage/storage.yml] =>
   parameters =>
     content =>
      @@ -2,20 +2,17 @@
       storage:
         cls: local
      -  args:
      -    db: host=db1.internal.staging.swh.network port=5432 user=swh dbname=swh password=swh-deploy-storage-db-password
      -    objstorage:
      -      cls: pathslicing
      -      args:
      -        root: "/srv/softwareheritage/objects"
      -        slicing: 0:1/1:5
      -    journal_writer:
      -      cls: kafka
      -      args:
      -        brokers:
      -        - journal1.internal.staging.swh.network
      -        prefix: swh.journal.objects
      -        client_id: swh.storage.journal_writer.storage1
      -        anonymize: true
      -        producer_config:
      -          message.max.bytes: 1000000000
      +  db: host=db1.internal.staging.swh.network port=5432 user=swh dbname=swh password=swh-deploy-storage-db-password
      +  objstorage:
      +    cls: pathslicing
      +    root: "/srv/softwareheritage/objects"
      +    slicing: 0:1/1:5
      +  journal_writer:
      +    cls: kafka
      +    brokers:
      +    - journal1.internal.staging.swh.network
      +    prefix: swh.journal.objects
      +    client_id: swh.storage.journal_writer.storage1
      +    anonymize: true
      +    producer_config:
      +      message.max.bytes: 1000000000
      _
*******************************************
*** End octocatalog-diff on storage1.internal.staging.swh.network

Diff Detail

Repository
rSPSITE puppet-swh-site
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.