Skip to content

staging: Enable swh rpc clients retry behavior in case of failure

Antoine R. Dumont requested to merge mr/activate-retry-for-swh-rpc-clients into staging

This enables the retry behavior on swh rpc clients.

In:

  • the local cluster for test purposes (ok) in the first commit.
  • in the staging cluster for the 2nd commit.

The end goal is to analyze whether that helps reducing the failures due to 502 when a redeployment of the rpc services occurs.

The current next version cluster has the configuration already set (and it's currently ok).

Once the current next version merged, this will trigger a bunch of services restart which should help in analyzing if there is less crash following a (rpc) deployment.

helm diff
[swh] Comparing changes between branches production and mr/activate-retry-for-swh-rpc-clients (per environment)...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment staging, namespace swh...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra-next-version...
[swh] Generate config in mr/activate-retry-for-swh-rpc-clients branch for environment staging...
[swh] Generate config in mr/activate-retry-for-swh-rpc-clients branch for environment staging...
[swh] Generate config in mr/activate-retry-for-swh-rpc-clients branch for environment staging...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment production, namespace swh...
[swh] Generate config in production branch for environment production, namespace swh-cassandra...
[swh] Generate config in production branch for environment production, namespace swh-cassandra-next-version...
[swh] Generate config in mr/activate-retry-for-swh-rpc-clients branch for environment production...
[swh] Generate config in mr/activate-retry-for-swh-rpc-clients branch for environment production...
[swh] Generate config in mr/activate-retry-for-swh-rpc-clients branch for environment production...


------------- diff for environment staging namespace swh -------------

--- /tmp/swh-chart.swh.0Nvwr6Jt/staging-swh.before	2024-11-25 12:15:06.285879812 +0100
+++ /tmp/swh-chart.swh.0Nvwr6Jt/staging-swh.after	2024-11-25 12:15:07.029851564 +0100
@@ -251,20 +251,21 @@
   config.yml: |
     storage:
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-postgresql-read-only-rpc-ingress
     
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc-ingress
 
     debug: true
 
     introspection: true
 
     max_raw_content_size: 10000
 
     max_query_cost:
       anonymous: 50
@@ -1174,20 +1175,21 @@
     storage:
       cls: pipeline
       steps:
       - cls: masking
         masking_db: host=db1.internal.staging.swh.network port=5432 user=guest dbname=swh-masking
           password=${MASKING_GUEST_PGPASSWORD}
       - cls: postgresql
         db: host=db1.internal.staging.swh.network port=5432 user=guest dbname=swh password=${POSTGRESQL_PASSWORD}
         objstorage:
           cls: remote
+          enable_requests_retry: true
           url: http://objstorage-read-only-rpc-ingress
 ---
 # Source: swh/templates/storage/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh
   name: storage-postgresql-read-only-configuration-logging
 data:
   logging-gunicorn.json: |
@@ -1263,20 +1265,21 @@
       cls: pipeline
       steps:
       - blocking_db: host=db1.internal.staging.swh.network port=5432 user=swh-blocking
           dbname=swh-blocking password=${BLOCKING_ADMIN_PGPASSWORD}
         cls: blocking
       - cls: record_references
       - cls: postgresql
         db: host=db1.internal.staging.swh.network port=5432 user=swh dbname=swh password=${POSTGRESQL_PASSWORD}
         objstorage:
           cls: remote
+          enable_requests_retry: true
           url: http://objstorage-multiplexer-read-write-rpc-ingress
 ---
 # Source: swh/templates/storage/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh
   name: storage-postgresql-read-write-configuration-logging
 data:
   logging-gunicorn.json: |
@@ -2120,42 +2123,47 @@
     allowed_hosts:
       - webapp-postgresql.internal.staging.swh.network
       - web-postgresql.swh
       - ${POD_IP}
     staging_server_names:
       - webapp-postgresql.internal.staging.swh.network
       - web-postgresql.swh
       - ${POD_IP}
     storage:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-postgresql-read-only-rpc-ingress
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.staging.swh.network
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc-ingress
     graph:
       max_edges:
         anonymous: 1000
         staff: 0
         user: 100000
       server_url: http://graph-rpc-ingress/graph/
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rpc-ingress
     counters_backend: swh-counters
     counters:
       cls: remote
+      enable_requests_retry: true
       url: http://counters-rpc-ingress
     deposit:
       private_api_url: https://deposit.staging.swh.network/1/private/
       private_api_user: ${DEPOSIT_USERNAME}
       private_api_password: ${DEPOSIT_PASSWORD}
     add_forge_now:
       email_address: add-forge-now@webapp.staging.swh.network
     history_counters_url: http://counters-rpc-ingress/counters_history/history.json
 
 
@@ -2632,21 +2640,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: graphql-postgresql
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: ceeba983769f36075036f03ec3c3df458b48b4c5c7a650f323520c5a495ec91f
+        checksum/config: c7480b5321a29413e5ce254eba9940eb2d71bffaa9eebecd5cfbb8fd2949fdea
         checksum/config-logging: b65f6f419a712ce285c93afd731f436b8a6134585db24e90001fd894c447ac6d
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/rpc
                 operator: In
                 values:
@@ -5298,21 +5306,21 @@
       app: storage-postgresql-read-only
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: storage-postgresql-read-only
       annotations:
-        checksum/config: 6af52166b9f1e49fbd071779062391bfced2a4756536ec9f022d05a49175b758
+        checksum/config: 557a29778d601193c743a35a7075315560447fc8740ba7922d5d52ce3f0c621e
         checksum/config-logging: cca6d0318bd776cd9bee0901e67e4db9fa401456f6f03f569c15468c5e62bea7
         checksum/backend-utils: e4fe78d5a14cf0d82fe9435d64687d68fba8ff20d9fdb0bd7127a0c16c30f441
         checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/storage
@@ -5462,21 +5470,21 @@
       app: storage-postgresql-read-write
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: storage-postgresql-read-write
       annotations:
-        checksum/config: 9f5430a1a4ac7f7174f411d084f612555e00a70f066b8fb3d6c14034371c1633
+        checksum/config: 99705164e581d0a9cc5f7b62601edf49002a1e0b8714b7391f9527080d9d0094
         checksum/config-logging: c9f05b677492d0f7443fc8193c82673ce3c550f351b82dcf616a247f7477fae0
         checksum/backend-utils: e4fe78d5a14cf0d82fe9435d64687d68fba8ff20d9fdb0bd7127a0c16c30f441
         checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/storage
@@ -5787,21 +5795,21 @@
       app: web-postgresql
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web-postgresql
       annotations:
-        checksum/config: 68f52ffc1a0f6cc4bf4a69173573b3d61d7a98c98088d045934f75399a2b2faf
+        checksum/config: 53ef19416cf2f2158d44389f0c060ee7aac26e3e137ce0ac9d47144f10b3398d
         checksum/config-logging: 81fb24577eb1777be8690f58c1e92d701777fe4ff045bb8445feb924947b9f84
         checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In


------------- diff for environment staging namespace swh-cassandra -------------

--- /tmp/swh-chart.swh.0Nvwr6Jt/staging-swh-cassandra.before	2024-11-25 12:15:06.613867358 +0100
+++ /tmp/swh-chart.swh.0Nvwr6Jt/staging-swh-cassandra.after	2024-11-25 12:15:07.349839412 +0100
@@ -305,27 +305,30 @@
         brokers:
         - journal2.internal.staging.swh.network:9092
         client_id: swh.storage-cassandra.journal_writer.${HOSTNAME}
         cls: kafka
         prefix: swh.journal.objects
         producer_config:
           message.max.bytes: 1000000000
     removal_objstorages:
       db1:
         cls: remote
+        enable_requests_retry: true
         url: http://objstorage-db1-delete-rpc-ingress
       storage1:
         cls: remote
+        enable_requests_retry: true
         url: http://objstorage-storage1-delete-rpc-ingress
     removal_searches:
       search:
         cls: remote
+        enable_requests_retry: true
         url: http://search-rpc-ingress
     removal_storages:
       cassandra:
         auth_provider:
           cls: cassandra.auth.PlainTextAuthProvider
           password: ${CASSANDRA_PASSWORD}
           username: swh-rw
         cls: cassandra
         consistency_level: LOCAL_QUORUM
         directory_entries_insert_algo: batch
@@ -358,20 +361,21 @@
           revision_parents: 200
       - cls: filter
       - cls: retry
       - cls: remote
         url: http://storage-cassandra-read-write-ingress
     storage:
       cls: postgresql
       db: host=db1.internal.staging.swh.network port=5432 user=swh dbname=swh password=${POSTGRESQL_PASSWORD}
       objstorage:
         cls: remote
+        enable_requests_retry: true
         url: http://objstorage-read-only-rpc-ingress
 ---
 # Source: swh/templates/checker-deposit/configmap-utils.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: checker-deposit-utils
   namespace: swh-cassandra
 data:
   pre-stop-idempotent.sh: |
@@ -509,20 +513,21 @@
 data:
   config.yml.template: |
     storage:
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-cassandra-read-only-ingress
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc-ingress
     graph:
       url: http://graph-rpc-ingress/graph
     max_bundle_size: 1073741824
     thread_pool_size: 4
     celery:
       task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
       task_acks_late: false
       task_modules:
         - swh.vault.cooking_tasks
@@ -594,20 +599,21 @@
 data:
   config.yml.template: |
     storage:
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-cassandra-read-only-ingress
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc-ingress
     graph:
       url: http://graph-rpc-ingress/graph
     max_bundle_size: 1073741824
     thread_pool_size: 4
     celery:
       task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
       task_acks_late: true
       task_modules:
         - swh.vault.cooking_tasks
@@ -673,20 +679,21 @@
 # Source: swh/templates/counters/journal-client-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: counters-journal-client-configuration-template
   namespace: swh-cassandra
 data:
   config.yml.template: |
     counters:
       cls: remote
+      enable_requests_retry: true
       url: http://counters-rpc-ingress
     journal:
       brokers:
         - journal2.internal.staging.swh.network:9092
       group_id: swh.counters.journal_client
       message.max.bytes: 524288000
       object_types:
       - content
       - directory
       - origin
@@ -848,23 +855,25 @@
 data:
   config.yml.template: |
     instance_name: deposit-rpc-ingress
     allowed_hosts:
       - deposit-rpc-ingress
       - deposit.staging.swh.network
       - deposit-dynamic.internal.staging.swh.network
     swh_authority_url: deposit-rpc-ingress
     storage:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-cassandra-read-only-ingress
     storage_metadata:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-cassandra-read-write-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.staging.swh.network
     authentication_provider: keycloak
     keycloak:
       realm_name: SoftwareHeritageStaging
       server_url: https://auth.softwareheritage.org/auth/
     
     private:
@@ -989,20 +998,21 @@
   config.yml: |
     storage:
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-cassandra-read-only-ingress
     
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc-ingress
 
     debug: true
 
     introspection: true
 
     max_raw_content_size: 10000
 
     max_query_cost:
       anonymous: 50
@@ -1207,23 +1217,25 @@
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-cassandra-read-only-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.staging.swh.network
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rpc-ingress
     objstorage:
       cls: remote
+      enable_requests_retry: true
       url: http://objstorage-read-only-rpc-ingress
     journal_client:
       brokers:
         - journal2.internal.staging.swh.network:9094
       batch_size: 200
       cls: kafka
       group_id: swh-archive-stg-swh.indexer.journal_client.extrinsic_metadata
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
@@ -1246,23 +1258,25 @@
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-cassandra-read-only-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.staging.swh.network
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rpc-ingress
     objstorage:
       cls: remote
+      enable_requests_retry: true
       url: http://objstorage-read-only-rpc-ingress
     journal_client:
       brokers:
         - journal2.internal.staging.swh.network:9094
       batch_size: 200
       cls: kafka
       group_id: swh-archive-stg-swh.indexer.journal_client.origin_intrinsic_metadata
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
@@ -5463,23 +5477,25 @@
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: objstorage-multiplexer-read-only-configuration-template
 data:
   config.yml.template: |
     objstorage:
       cls: multiplexer
       objstorages:
       - cls: remote
+        enable_requests_retry: true
         name: storage1
         url: http://objstorage-storage1-ro-rpc-ingress
       - cls: remote
+        enable_requests_retry: true
         name: db1
         url: http://objstorage-db1-ro-rpc-ingress
       readonly: true
     client_max_size: 1073741824
 ---
 # Source: swh/templates/objstorage/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
@@ -5551,26 +5567,28 @@
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: objstorage-multiplexer-read-write-configuration-template
 data:
   config.yml.template: |
     objstorage:
       cls: multiplexer
       objstorages:
       - cls: remote
+        enable_requests_retry: true
         name: db1
         url: http://objstorage-db1-rw-rpc-ingress
       - cls: read-only
         name: storage1
         storage:
           cls: remote
+          enable_requests_retry: true
           url: http://objstorage-storage1-ro-rpc-ingress
 ---
 # Source: swh/templates/objstorage/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: objstorage-multiplexer-read-write-configuration-logging
 data:
   logging-gunicorn.json: |
@@ -6008,20 +6026,21 @@
       group_id: swh-archive-stg-objstorage
       message.max.bytes: 524288000
       on_eof: restart
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
       sasl.username: swh-archive-stg
       security.protocol: SASL_SSL
     objstorage:
       cls: remote
+      enable_requests_retry: true
       name: db1
       url: http://objstorage-db1-ro-rpc-ingress
 ---
 # Source: swh/templates/scrubber/objstorage-checker-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: scrubber-objstoragechecker-storage1-template
 data:
@@ -6049,82 +6068,89 @@
       group_id: swh-archive-stg-objstorage
       message.max.bytes: 524288000
       on_eof: restart
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
       sasl.username: swh-archive-stg
       security.protocol: SASL_SSL
     objstorage:
       cls: remote
+      enable_requests_retry: true
       name: storage1
       url: http://objstorage-storage1-ro-rpc-ingress
 ---
 # Source: swh/templates/search/journal-client-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: search-journal-client-indexed-configuration-template
   namespace: swh-cassandra
 data:
   config.yml.template: |
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc-ingress
     storage:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-cassandra-read-only-ingress
     journal:
       brokers:
         - journal2.internal.staging.swh.network:9092
       group_id: swh.search.journal_client.indexed-v0.11
       object_types:
       - origin_intrinsic_metadata
       - origin_extrinsic_metadata
       prefix: swh.journal.indexed
 ---
 # Source: swh/templates/search/journal-client-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: search-journal-client-objects-configuration-template
   namespace: swh-cassandra
 data:
   config.yml.template: |
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc-ingress
     storage:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-cassandra-read-only-ingress
     journal:
       brokers:
         - journal2.internal.staging.swh.network:9092
       group_id: swh.search.journal_client-v0.11
       object_types:
       - origin
       - origin_visit_status
       prefix: swh.journal.objects
 ---
 # Source: swh/templates/search/journal-client-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: search-journal-client-objects-test-configuration-template
   namespace: swh-cassandra
 data:
   config.yml.template: |
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-in-kube-rpc-ingress
     storage:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-cassandra-read-only-ingress
     journal:
       brokers:
         - journal2.internal.staging.swh.network:9092
       group_id: swh.search.journal-client-test-v0.11
       object_types:
       - origin
       - origin_visit_status
       prefix: swh.journal.objects
 ---
@@ -6950,20 +6976,21 @@
           brokers:
           - journal2.internal.staging.swh.network:9092
           client_id: swh.storage-cassandra.journal_writer.${HOSTNAME}
           cls: kafka
           prefix: swh.journal.objects
           producer_config:
             message.max.bytes: 1000000000
         keyspace: swh
         objstorage:
           cls: remote
+          enable_requests_retry: true
           url: http://objstorage-multiplexer-read-write-rpc-ingress
 ---
 # Source: swh/templates/storage/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: storage-cassandra-configuration-logging
 data:
   logging-gunicorn.json: |
@@ -7047,20 +7074,21 @@
           username: swh-ro
         cls: cassandra
         consistency_level: LOCAL_QUORUM
         hosts:
         - cassandra1.internal.staging.swh.network
         - cassandra2.internal.staging.swh.network
         - cassandra3.internal.staging.swh.network
         keyspace: swh
         objstorage:
           cls: remote
+          enable_requests_retry: true
           url: http://objstorage-read-only-rpc-ingress
 ---
 # Source: swh/templates/storage/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: swh-cassandra
   name: storage-cassandra-read-only-configuration-logging
 data:
   logging-gunicorn.json: |
@@ -7217,20 +7245,21 @@
       group_id: swh-archive-stg-objstorage
       message.max.bytes: 524288000
       on_eof: restart
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
       sasl.username: swh-archive-stg
       security.protocol: SASL_SSL
     objstorage:
       cls: remote
+      enable_requests_retry: true
       name: db1
       url: http://objstorage-db1-ro-rpc-ingress
 ---
 # Source: swh/templates/toolbox/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: toolbox-scrubber-objstorage-storage1-template
   namespace: swh-cassandra
 data:
@@ -7258,20 +7287,21 @@
       group_id: swh-archive-stg-objstorage
       message.max.bytes: 524288000
       on_eof: restart
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
       sasl.username: swh-archive-stg
       security.protocol: SASL_SSL
     objstorage:
       cls: remote
+      enable_requests_retry: true
       name: storage1
       url: http://objstorage-storage1-ro-rpc-ingress
 ---
 # Source: swh/templates/toolbox/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: toolbox-scrubber-storage-template
   namespace: swh-cassandra
 data:
@@ -8157,20 +8187,21 @@
       - cls: retry
       - cls: remote
         url: http://storage-cassandra-read-only-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.staging.swh.network
     objstorage:
       cls: read-only
       storage:
         cls: remote
+        enable_requests_retry: true
         url: http://objstorage-read-only-rpc-ingress
     cache:
       cls: azure
       compression: none
       connection_string: DefaultEndpointsProtocol=https;AccountName=swhvaultstoragestaging;AccountKey=${ACCOUNT_KEY};EndpointSuffix=core.windows.net
       container_name: contents-uncompressed
     smtp:
       host: smtp.inria.fr
       port: 25
 ---
@@ -8256,45 +8287,51 @@
       - webapp-cassandra.internal.staging.swh.network
       - web-cassandra.swh-cassandra
       - ${POD_IP}
     staging_server_names:
       - webapp.staging.swh.network
       - webapp-cassandra.internal.staging.swh.network
       - web-cassandra.swh-cassandra
       - ${POD_IP}
     storage:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-cassandra-read-only-ingress
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc-ingress
     provenance:
       cls: remote
+      enable_requests_retry: true
       url: http://webapp-provenance-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.staging.swh.network
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc-ingress
     graph:
       max_edges:
         anonymous: 1000
         staff: 0
         user: 100000
       server_url: http://graph-rpc-ingress/graph/
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rpc-ingress
     counters_backend: swh-counters
     counters:
       cls: remote
+      enable_requests_retry: true
       url: http://counters-rpc-ingress
     deposit:
       private_api_url: https://deposit.staging.swh.network/1/private/
       private_api_user: ${DEPOSIT_USERNAME}
       private_api_password: ${DEPOSIT_PASSWORD}
     add_forge_now:
       email_address: add-forge-now@webapp.staging.swh.network
     history_counters_url: http://counters-rpc-ingress/counters_history/history.json
 
 
@@ -8455,42 +8492,47 @@
       - webapp-cassandra.internal.staging.swh.network
       - web-webhooks.swh-cassandra
       - ${POD_IP}
     staging_server_names:
       - webapp.staging.swh.network
       - webapp-cassandra.internal.staging.swh.network
       - web-webhooks.swh-cassandra
       - ${POD_IP}
     storage:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-cassandra-read-only-ingress
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc-ingress
     scheduler:
       cls: remote
       url: http://scheduler.internal.staging.swh.network
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc-ingress
     graph:
       max_edges:
         anonymous: 1000
         staff: 0
         user: 100000
       server_url: http://graph-rpc-ingress/graph/
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rpc-ingress
     counters_backend: swh-counters
     counters:
       cls: remote
+      enable_requests_retry: true
       url: http://counters-rpc-ingress
     deposit:
       private_api_url: https://deposit.staging.swh.network/1/private/
       private_api_user: ${DEPOSIT_USERNAME}
       private_api_password: ${DEPOSIT_PASSWORD}
     add_forge_now:
       email_address: add-forge-now@webapp.staging.swh.network
     history_counters_url: http://counters-rpc-ingress/counters_history/history.json
 
 
@@ -9331,21 +9373,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: alter
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 21be4ae435f4ea6d590f84ed47714a453495b501803a02e285816d2738c5ccfa
+        checksum/config: b31bfbd16a0f89328c4ef7da269d0f669a8e9447e2098a49f10e08f1a0036dfa
     spec:
       securityContext:
         fsGroup: 1000
       
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
@@ -9602,21 +9644,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: cooker-batch
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 330f9daf7aaa20aebf95bf0b168478578ba39d1e653773d8536974cb11146ccc
+        checksum/config: 0129d41318883f6e0a9496c2de536160569f2efc7b0dbbf713576586ff937a27
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/cooker
                 operator: In
                 values:
@@ -9745,21 +9787,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: cooker-simple
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 330f9daf7aaa20aebf95bf0b168478578ba39d1e653773d8536974cb11146ccc
+        checksum/config: 0129d41318883f6e0a9496c2de536160569f2efc7b0dbbf713576586ff937a27
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/cooker
                 operator: In
                 values:
@@ -9886,21 +9928,21 @@
       app: counters-journal-client
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: counters-journal-client
       annotations:
-        checksum/config: d6503cbbc7f51715ef74c23f37ea3e5d2bbe18cf66a045a48eb19d453ca82d20
+        checksum/config: 51d8c8c7eeacb440e77d85dc16526a13fb49c2e351db8d77e322334a138af66c
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/journal_client
                 operator: In
                 values:
                 - "true"
@@ -10154,21 +10196,21 @@
       app: deposit
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: deposit
       annotations:
-        checksum/config: e06f44125ee5e63fd0c6e7a75fbf56d6d9766d7334e03fdc763a2cbe402d85a5
+        checksum/config: f8eae1ab8e0db17c416863ebded9df1c29817d787395ee76b88fe88c0346ab0e
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/deposit
                 operator: In
                 values:
                 - "true"
@@ -10715,21 +10757,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: graphql-cassandra
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 5dc75530018396cb78b6a470f416ea9688605915c49bc3810f1afdf511b749ab
+        checksum/config: 52431c7e08783148880fa6a90c9de973cdcb336ef4ada693bdf7dd77255410ca
         checksum/config-logging: b5376bb69c5dcca2723dc3d3e5b0e89ca1f231371bdc36ea7b128513c38c19d0
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/rpc
                 operator: In
                 values:
@@ -10973,21 +11015,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: indexer-extrinsic
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 20341f793046dae862b234ba7a9029b1645b6e8122a73a0a1b00d67e3d9698e4
+        checksum/config: 06f2957929c661efdc69d6ef1862fabcf3f58675c2e2bfb7be64a9f6b57839bd
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/indexer
                 operator: In
@@ -11105,21 +11147,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: indexer-origin-intrinsic
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 8c0b3fdb451484013fa8b652c4768f2d958bbfabc3a67a261297d28b9384e0f8
+        checksum/config: 9ccbe62ae2457d354de48e825d7d478afa2d6f191aa3671711530480645f6445
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/indexer
                 operator: In
@@ -18243,21 +18285,21 @@
       app: objstorage-multiplexer-read-only
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: objstorage-multiplexer-read-only
       annotations:
-        checksum/config: f718f6dc43fcb24c2674a1d77b38ca3d5a31557aa12251000083d5541570694e
+        checksum/config: 3c036eba7a88680874eeace00c6cc7a51066e3bc62ef9f869389865c7adf28e0
         checksum/config-logging: aa1f72e5bbd0dce4ff2c014f03ed6b8fa8b0ae2601210c52726c14442cf8568e
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/objstorage
                 operator: In
@@ -18381,21 +18423,21 @@
       app: objstorage-multiplexer-read-write
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: objstorage-multiplexer-read-write
       annotations:
-        checksum/config: 19f9480aff8304e470118875119838d8062c0c2f49d716aa783727e6d5eb511a
+        checksum/config: 7b6bab542c000d64fae5ec0f112948bd8403e6f02e02b18e93fd018c8a837f88
         checksum/config-logging: a7a69e7ff3c9a13d868576061fe15489a10ec6f84ece7623b6cf5a6d4fdc5dd0
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/objstorage
                 operator: In
@@ -19622,21 +19664,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: scrubber-objstoragechecker-db1
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 1b464f6d8c2099b29ea746568d22eb430fefbe3077f9b7bfe3d3dc83c69343a9
+        checksum/config: 50fb87cc53a902d2e87a1bbc32c030d589608c0c12ebb31d51d2cf45e2d51e94
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/scrubber
                 operator: In
                 values:
@@ -19794,21 +19836,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: scrubber-objstoragechecker-storage1
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: eba91a89735c415c184d1008178446de2068abddc1fa28f1db2b3120d60ced9f
+        checksum/config: 21a35883cafb082067d8c973e460f4bbe85c4ca26dbcc65265e2afff046f1d43
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/scrubber
                 operator: In
                 values:
@@ -19965,21 +20007,21 @@
       app: search-journal-client-indexed
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: search-journal-client-indexed
       annotations:
-        checksum/config: 9206e0217df26d096db0141501e5e7bdf033995e7aab9f72568cb2ecc79cbfc6
+        checksum/config: 44e0cc66c14f9094881fffc768e860a737c4cb842af06cf8bf1e0fca9ed4a990
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/journal_client
                 operator: In
                 values:
@@ -20078,21 +20120,21 @@
       app: search-journal-client-objects
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: search-journal-client-objects
       annotations:
-        checksum/config: 58e283e21b9092c28a80133f8ba1dc82aead4abbb312c6e4d935d535f6f8c5b4
+        checksum/config: 3f25e502550b7cd5e86b42ccf603c17b6e4b34c31444ab96031884db96cfefaa
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/journal_client
                 operator: In
                 values:
@@ -20191,21 +20233,21 @@
       app: search-journal-client-objects-test
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: search-journal-client-objects-test
       annotations:
-        checksum/config: cb179b86bfc304f36a4a6e293c85ad1c466e54a9395e853db163316a539c2d7b
+        checksum/config: 75d73c752f383f0c8d4b92e05068e1545450b51a548eb3a8e4c068a3ca463642
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/journal_client
                 operator: In
                 values:
@@ -22293,21 +22335,21 @@
       app: storage-cassandra
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: storage-cassandra
       annotations:
-        checksum/config: ee524b202a72cad36dee96cc62319f02ff024737efddf98801a22b976fc9e8da
+        checksum/config: d2a6c13e70a520cae738b2f7ec932beb25017bced93e9baaee0e03868f8bf149
         checksum/config-logging: 2f7a56936b194188f70175c52dc180320fcc071e5c110562a9f031116fadefd2
         checksum/backend-utils: f05e83ee23d0a6f024509f79edaa8e11d7e0829cea9481832ad0670267a3de60
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/storage
@@ -22462,21 +22504,21 @@
       app: storage-cassandra-read-only
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: storage-cassandra-read-only
       annotations:
-        checksum/config: b8ae6c11c13cc089647c79d7aa97da386b54caecad2d2fcc14fee329f7e9a33c
+        checksum/config: 35c9978e3d92d8b322a9b2b7b3e5a6bcc7b0cee806fcd343a034ddd7a3e7d6c0
         checksum/config-logging: 7403d71b4a2e4da28cc9c1af0b9d022e85bf0b5ffcb738dc9f2b6dcfa3e14456
         checksum/backend-utils: f05e83ee23d0a6f024509f79edaa8e11d7e0829cea9481832ad0670267a3de60
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/storage
@@ -22619,21 +22661,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: swh-toolbox
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 40212647370fea5f69b00bb180eabe78d57335b47eb671a015cd6a1e1b6e7949
+        checksum/config: dd651ef2e464efcd805d9a0b38099e51eee381f3fe6b47bf678cf83e103a89b1
         checksum/configScript: c23b77094af994ace25c94bfe58070847ad8d53a772e0c96676f4a2074057152
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/toolbox
                 operator: In
                 values:
@@ -23006,21 +23048,21 @@
       app: vault-rpc
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: vault-rpc
       annotations:
-        checksum/config: 087b6da3e2e1764a69724bc7b82a4955b8c4cb91e77b8aae5b29c48967bb1d23
+        checksum/config: b92834143e3958a8088fd680d886ae0e86ecae1b6fbe883b46ceac8759f80a0e
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/rpc
                 operator: In
                 values:
                 - "true"
@@ -23157,21 +23199,21 @@
       app: web-cassandra
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web-cassandra
       annotations:
-        checksum/config: c39611d0f2ec970b1a79b8736bf4673a5e2d3192fb1f5101aac035909c22da1d
+        checksum/config: cd6daa03251603cec6e4b1ffecba9e504804f11ab99df71389b12df08d85ac18
         checksum/config-logging: 21c90a039f27f4476045b8973a841bb2b3c0e4435be7fb9ab1d748372f8a96c8
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In
@@ -23425,21 +23467,21 @@
       app: web-webhooks
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web-webhooks
       annotations:
-        checksum/config: 293554d0345f585ff6eb80965fda7f753b15369091052ff11c0d06a1ab710a5b
+        checksum/config: 41255ae77121247737892cba07dcd7aeb1cf4d285f5796c2863f64a72997757e
         checksum/config-logging: 8204fa505554e2a92718b6446f5335481339d9b88337df1e300a3cdc6868c0a8
         checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In


------------- diff for environment staging namespace swh-cassandra-next-version -------------

--- /tmp/swh-chart.swh.0Nvwr6Jt/staging-swh-cassandra-next-version.before	2024-11-25 12:15:06.901856423 +0100
+++ /tmp/swh-chart.swh.0Nvwr6Jt/staging-swh-cassandra-next-version.after	2024-11-25 12:15:07.641828324 +0100
@@ -262,20 +262,21 @@
 data:
   config.yml.template: |
     storage:
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-ro-postgresql:5002
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc:5005
     graph:
       url: http://graph-rpc-ingress/graph
     max_bundle_size: 1073741824
     thread_pool_size: 4
     celery:
       task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
       task_acks_late: false
       task_modules:
         - swh.vault.cooking_tasks
@@ -347,20 +348,21 @@
 data:
   config.yml.template: |
     storage:
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-ro-postgresql:5002
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc:5005
     graph:
       url: http://graph-rpc-ingress/graph
     max_bundle_size: 1073741824
     thread_pool_size: 4
     celery:
       task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
       task_acks_late: true
       task_modules:
         - swh.vault.cooking_tasks
@@ -426,20 +428,21 @@
 # Source: swh/templates/counters/journal-client-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: counters-journal-client-configuration-template
   namespace: swh-cassandra-next-version
 data:
   config.yml.template: |
     counters:
       cls: remote
+      enable_requests_retry: true
       url: http://counters-rpc:5011
     journal:
       brokers:
         - kafka-cluster-kafka-brokers:9092
       group_id: swh-counters-journal-client
       message.max.bytes: 524288000
       object_types:
       - content
       - directory
       - origin
@@ -602,20 +605,21 @@
   config.yml.template: |
     instance_name: deposit-next-version.internal.staging.swh.network
     allowed_hosts:
       - deposit-next-version.internal.staging.swh.network
     swh_authority_url: deposit-next-version.internal.staging.swh.network
     storage:
       cls: remote
       url: http://storage-ro-postgresql:5002
     storage_metadata:
       cls: remote
+      enable_requests_retry: true
       url: http://storage-rw-cassandra:5002
     scheduler:
       cls: remote
       url: http://scheduler-rpc:5008
     authentication_provider: keycloak
     keycloak:
       realm_name: SoftwareHeritageStaging
       server_url: https://auth.softwareheritage.org/auth/
     
     private:
@@ -740,20 +744,21 @@
   config.yml: |
     storage:
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-ro-postgresql:5002
     
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc:5010
 
     debug: true
 
     introspection: true
 
     max_raw_content_size: 10000
 
     max_query_cost:
       anonymous: 50
@@ -959,20 +964,21 @@
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-ro-postgresql:5002
     scheduler:
       cls: remote
       url: http://scheduler-rpc:5008
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rw:5007
     objstorage:
       cls: remote
       url: http://objstorage-ro-pathslicing:5003
     journal_client:
       brokers:
         - kafka-cluster-kafka-brokers:9092
       batch_size: 200
       cls: kafka
       group_id: swh-indexer-journal-client-extrinsic-metadata
@@ -994,20 +1000,21 @@
       cls: pipeline
       steps:
       - cls: retry
       - cls: remote
         url: http://storage-ro-postgresql:5002
     scheduler:
       cls: remote
       url: http://scheduler-rpc:5008
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rw:5007
     objstorage:
       cls: remote
       url: http://objstorage-ro-pathslicing:5003
     journal_client:
       brokers:
         - kafka-cluster-kafka-brokers:9092
       batch_size: 200
       cls: kafka
       group_id: swh-indexer-journal-client-origin-intrinsic-metadata
@@ -5244,20 +5251,21 @@
 # Source: swh/templates/search/journal-client-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: search-journal-client-indexed-configuration-template
   namespace: swh-cassandra-next-version
 data:
   config.yml.template: |
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc:5010
     storage:
       cls: remote
       url: http://storage-ro-postgresql:5002
     journal:
       brokers:
         - kafka-cluster-kafka-brokers:9092
       group_id: swh-search-journal-client-indexed-v0.11
       object_types:
       - origin_intrinsic_metadata
@@ -5267,20 +5275,21 @@
 # Source: swh/templates/search/journal-client-configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: search-journal-client-objects-configuration-template
   namespace: swh-cassandra-next-version
 data:
   config.yml.template: |
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc:5010
     storage:
       cls: remote
       url: http://storage-ro-postgresql:5002
     journal:
       brokers:
         - kafka-cluster-kafka-brokers:9092
       group_id: swh-search-journal-client-origins
       object_types:
       - origin
@@ -6323,20 +6332,21 @@
       group_id: swh-archive-stg-objstorage
       message.max.bytes: 524288000
       on_eof: restart
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
       sasl.username: swh-archive-stg
       security.protocol: SASL_SSL
     objstorage:
       cls: remote
+      enable_requests_retry: true
       name: db1
       url: http://objstorage-db1-ro-rpc-ingress
 ---
 # Source: swh/templates/toolbox/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: toolbox-scrubber-objstorage-storage1-template
   namespace: swh-cassandra-next-version
 data:
@@ -6362,20 +6372,21 @@
       group_id: swh-archive-stg-objstorage
       message.max.bytes: 524288000
       on_eof: restart
       prefix: swh.journal.objects
       sasl.mechanism: SCRAM-SHA-512
       sasl.password: ${BROKER_USER_PASSWORD}
       sasl.username: swh-archive-stg
       security.protocol: SASL_SSL
     objstorage:
       cls: remote
+      enable_requests_retry: true
       name: storage1
       url: http://objstorage-storage1-ro-rpc-ingress
 ---
 # Source: swh/templates/toolbox/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: toolbox-scrubber-storage-template
   namespace: swh-cassandra-next-version
 data:
@@ -7287,20 +7298,21 @@
       - cls: retry
       - cls: remote
         url: http://storage-ro-postgresql:5002
     scheduler:
       cls: remote
       url: http://scheduler-rpc:5008
     objstorage:
       cls: read-only
       storage:
         cls: remote
+        enable_requests_retry: true
         url: http://objstorage-read-only-rpc-ingress
     cache:
       cls: azure
       compression: none
       connection_string: DefaultEndpointsProtocol=https;AccountName=swhvaultstoragestaging;AccountKey=${ACCOUNT_KEY};EndpointSuffix=core.windows.net
       container_name: contents-uncompressed
     smtp:
       host: smtp.inria.fr
       port: 25
 ---
@@ -7387,42 +7399,47 @@
       - ${POD_IP}
     staging_server_names:
       - webapp-cassandra-next-version.internal.staging.swh.network
       - web-cassandra.swh-cassandra-next-version
       - ${POD_IP}
     storage:
       cls: remote
       url: http://storage-ro-postgresql:5002
     search:
       cls: remote
+      enable_requests_retry: true
       url: http://search-rpc:5010
     provenance:
       cls: remote
+      enable_requests_retry: true
       url: http://webapp-provenance-ingress-next-version
     scheduler:
       cls: remote
       url: http://scheduler-rpc:5008
     vault:
       cls: remote
+      enable_requests_retry: true
       url: http://vault-rpc:5005
     graph:
       max_edges:
         anonymous: 1000
         staff: 0
         user: 100000
       server_url: http://graph-rpc-next-version-ingress/graph/
     indexer_storage:
       cls: remote
+      enable_requests_retry: true
       url: http://indexer-storage-rw:5007
     counters_backend: swh-counters
     counters:
       cls: remote
+      enable_requests_retry: true
       url: http://counters-rpc:5011
     deposit:
       private_api_url: https://deposit-next-version.internal.staging.swh.network/1/private/
       private_api_user: ${DEPOSIT_USERNAME}
       private_api_password: ${DEPOSIT_PASSWORD}
     add_forge_now:
       email_address: add-forge-now@webapp.staging.swh.network
     history_counters_url: http://counters-rpc:5011/counters_history/history.json#
 
 
@@ -8318,21 +8335,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: cooker-batch
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 8873d285f189ae3b7063ddc1bce3b3ced6954f287c875a0e3244aa31128b7044
+        checksum/config: 84c7a88c380cf450d581f776b0d8eb877a4fc939dc3e7742e60afcfc12aea428
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/cooker
                 operator: In
                 values:
@@ -8461,21 +8478,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: cooker-simple
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 8873d285f189ae3b7063ddc1bce3b3ced6954f287c875a0e3244aa31128b7044
+        checksum/config: 84c7a88c380cf450d581f776b0d8eb877a4fc939dc3e7742e60afcfc12aea428
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/cooker
                 operator: In
                 values:
@@ -8602,21 +8619,21 @@
       app: counters-journal-client
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: counters-journal-client
       annotations:
-        checksum/config: dfa6529b3c7f59612b171a21e5d783b8323e53ef4c851bb0dcc3345da8efff32
+        checksum/config: fa521abb7f358f56dd43e5779968cccce3b23a371d56cecb46ec82ad2fca4be3
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/journal_client
                 operator: In
                 values:
                 - "true"
@@ -8860,21 +8877,21 @@
       app: deposit
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: deposit
       annotations:
-        checksum/config: 8e68c0c31a2bb706870f0ba494752f6b28fa0c3cf592e427741b90910822fbf3
+        checksum/config: 349cd551db3f6e99f3674012bb0bbf54cb02197e0ead9ff52257ec1d8671e770
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/deposit
                 operator: In
                 values:
                 - "true"
@@ -9423,21 +9440,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: graphql-cassandra
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 0a674e8a1b1bcd03fd83174a5398f9b38f0517cb18368c428276a54a6c59f52c
+        checksum/config: 78038303e932359247f717cb5162e01b1f392703a5858e8e2a4e053aed54bec7
         checksum/config-logging: c183f5eb75540b138ca8c036a2fabb7a59cb0131ca33dcf502a52f45a242c54b
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/rpc
                 operator: In
                 values:
@@ -9757,21 +9774,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: indexer-extrinsic
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 4558a792d33ada4e28aca64e6ddf7c072b0a9cde0e450c587008aacba405c1c3
+        checksum/config: ae9faa67debb9dbb5503f5ca73ee53a1895a05c36bfbed41654c78d1900dc5a7
         checksum/config-utils: 94d255131467f84bef964a4c72b2b792c5ebaf711bb1c77829d7cd1007a8ac22
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/indexer
                 operator: In
@@ -9878,21 +9895,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: indexer-origin-intrinsic
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 44fddbf11495ecf6938b9191eb64a7826dcb8e98f8ad703e82829d1a986d4bee
+        checksum/config: 4271d1797883e440437faa69f86a185c245cd7cc9cbbaecce70548f726b0b428
         checksum/config-utils: 94d255131467f84bef964a4c72b2b792c5ebaf711bb1c77829d7cd1007a8ac22
     spec:
       affinity:
         
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/indexer
                 operator: In
@@ -17892,21 +17909,21 @@
       app: search-journal-client-indexed
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: search-journal-client-indexed
       annotations:
-        checksum/config: 31a85b59675240f401f60e00fa38d3880cd3aee4e82ab8f4a5b9f5cf810b63a0
+        checksum/config: 11cac85efedc3c3677c78c1cd3b30bb8027aa8afeea01f1e5eaffde88ed36b99
         checksum/config-utils: 94d255131467f84bef964a4c72b2b792c5ebaf711bb1c77829d7cd1007a8ac22
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/journal_client
                 operator: In
                 values:
@@ -18005,21 +18022,21 @@
       app: search-journal-client-objects
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: search-journal-client-objects
       annotations:
-        checksum/config: 127d590b12a085b6af6e34fcbbdc8997b0d9f1b6e5f2d7b85a4ad366248894ea
+        checksum/config: 7313f33a9a668eeb3556ea53ddeff13c444fcc66a1ebe26b3fcabb844f0984d3
         checksum/config-utils: 94d255131467f84bef964a4c72b2b792c5ebaf711bb1c77829d7cd1007a8ac22
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/journal_client
                 operator: In
                 values:
@@ -20234,21 +20251,21 @@
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: swh-toolbox
       annotations:
         # Force a rollout upgrade if the configuration changes
-        checksum/config: 1c502c55265cbfa6abb995bb23434dd96cf4a7e4d2a3f1e4ca2cb0de00bc3fea
+        checksum/config: b9e349a935f514d0ccdb81d83581cdf053228ae01eedfea5c56ddb5a9356bb0b
         checksum/configScript: 9fe2fc1c0533e8b849299c9a7e8ef7cbe6fc621786d1d29cef42d5f5edb65557
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/toolbox
                 operator: In
                 values:
@@ -20668,21 +20685,21 @@
       app: vault-rpc
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: vault-rpc
       annotations:
-        checksum/config: 067be5bb661d0e46e1bea64a078365adbafd744b8b221a81004d7da2b132a469
+        checksum/config: fd7ce460410180dd01b8b772648f561b76f3dee9b92acce046c7edb4fcb03ba6
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/rpc
                 operator: In
                 values:
                 - "true"
@@ -20836,21 +20853,21 @@
       app: web-cassandra
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: web-cassandra
       annotations:
-        checksum/config: f425b6cf9e4d84c0ec4d11f42801514fb5ada737a07ca5d451d590c520f74682
+        checksum/config: c9c8ff7f38388d495a812280b2d9d537d95a717998cfae84fe19ba879ceaabdb
         checksum/config-logging: f266f784128ac9c57c6d0f154a646e15f06d0ad7557f191487df0d1b385acb48
         checksum/config-utils: 94d255131467f84bef964a4c72b2b792c5ebaf711bb1c77829d7cd1007a8ac22
     spec:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
               - key: swh/web
                 operator: In


------------- diff for environment production namespace swh -------------

No differences


------------- diff for environment production namespace swh-cassandra -------------

No differences

[1] !511 (merged)

Refs. swh/infra/sysadm-environment#5493

Edited by Antoine R. Dumont

Merge request reports

Loading