Page MenuHomeSoftware Heritage

replay: Replace collision aware policy with retry proxy storage configuration
AbandonedPublic

Authored by ardumont on Apr 11 2020, 12:46 PM.

Details

Reviewers
None
Group Reviewers
Reviewers
Summary

As it's now integrated within the retry proxy storage.

Related to D3012

Note:

  • tests will fail because D3012 needs to be merged and storage bumped first.
  • This conflicts with D3008 (which moves the replayer in the storage). So this should be diffed against the storage when D3008 lands.
Test Plan

tox
(will be happy at some point in time)

Diff Detail

Unit TestsFailed

TimeTest
8,107 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.journal.tests.test_replay::test_storage_play_with_collision
self = <Retrying object at 0x7fce29c29f60 (stop=<tenacity.stop.stop_after_attempt object at 0x7fce29c297b8>, wait=<tenacity.w...0x7fce29c4cf28>, before=<function before_nothing at 0x7fce2a1b6510>, after=<function after_nothing at 0x7fce2a1c5ea0>)> fn = <function RetryingProxyStorage.content_add_metadata at 0x7fce29ce46a8> args = (<swh.storage.retry.RetryingProxyStorage object at 0x7fce29c40160>, [Content(sha1=b'\x0b\xee\xc7\xb5\xea?\x0f\xdb\xc9]...=b'bnother-foo', sha256=b'another-baz', blake2s256=b'another-bar', length=4, status='visible', data=None, ctime=None)])
4 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.journal.fixer::swh.journal.fixer._fix_content
2 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.journal.fixer::swh.journal.fixer._fix_origin
4 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.journal.fixer::swh.journal.fixer._fix_origin_visit
4 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.journal.fixer::swh.journal.fixer._fix_revision
View Full Test Results (1 Failed · 39 Passed)

Event Timeline

Build has FAILED

Patch application report for D3015 (id=10701)

Rebasing onto 63bd07af49...

Current branch diff-target is up to date.
Changes applied before test
commit d5d3cd5b4046896aa26abcfb41e70423136b176f
Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
Date:   Sat Apr 11 12:31:08 2020 +0200

    replay: Replace collision aware policy with retry proxy storage configuration
    
    It's now integrated within the retry proxy storage.
    
    Related to D3012

Link to build: https://jenkins.softwareheritage.org/job/DJNL/job/tests-on-diff/46/
See console output for more information: https://jenkins.softwareheritage.org/job/DJNL/job/tests-on-diff/46/console