Page MenuHomeSoftware Heritage

vault: Add retry ability to the storage
ClosedPublic

Authored by ardumont on Dec 7 2020, 5:20 PM.

Details

Summary

I did not use the pipeline voluntarily as my understanding during our spec discussion was, we want to move away from it.

I gather otherwise, that'd be something like:

storage:
  cls: pipeline
  steps:
    - cls: retry
    - cls: remote
      url: "%{alias('swh::remote_service::storage::config')}"

Related to T1191 T2862

Test Plan

bin/octocatalog:

bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging vangogh.euwest.azure
Found host vangogh.euwest.azure.internal.softwareheritage.org
WARN     -> Environment "arcpatch-D4460" contained non-word characters, correcting name to arcpatch_D4460
WARN     -> Environment "open-template1" contained non-word characters, correcting name to open_template1
WARN     -> Environment "update-writer-config" contained non-word characters, correcting name to update_writer_config
WARN     -> Environment "wip-pg-hba-rules-in-yaml" contained non-word characters, correcting name to wip_pg_hba_rules_in_yaml
Cloning into '/tmp/swh-ocd.2Coh8yCA/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.2Coh8yCA/environments/staging/data/private'...
done.
*** Running octocatalog-diff on host vangogh.euwest.azure.internal.softwareheritage.org
I, [2020-12-07T17:19:32.350580 #26857]  INFO -- : Catalogs compiled for vangogh.euwest.azure.internal.softwareheritage.org
I, [2020-12-07T17:19:33.357716 #26857]  INFO -- : Diffs computed for vangogh.euwest.azure.internal.softwareheritage.org
diff origin/production/vangogh.euwest.azure.internal.softwareheritage.org current/vangogh.euwest.azure.internal.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/vault/server.yml] =>
   parameters =>
     content =>
      @@ -1,7 +1,9 @@
       ---
       storage:
      -  cls: remote
      -  args:
      -    url: http://storage01.euwest.azure.internal.softwareheritage.org:5002/
      +  cls: retry
      +  storage:
      +    cls: remote
      +    args:
      +      url: http://storage01.euwest.azure.internal.softwareheritage.org:5002/
       scheduler:
         cls: remote
*******************************************
*** End octocatalog-diff on vangogh.euwest.azure.internal.softwareheritage.org

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.

Event Timeline

Tested in docker env, the config is valid after D4685 applied.

This revision is now accepted and ready to land.Dec 8 2020, 5:01 PM