Page MenuHomeSoftware Heritage
Differential D3262

storage*: Align origin-visit-add to take iterable of OriginVisit objects as input
ClosedPublic
Actions

Authored by ardumont on Jun 11 2020, 3:26 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T2310: Make origin visits immutable
Commits
rDSTO37c45300bc44: storage*: Align origin-visit-add to take iterable of OriginVisit objects
Summary

This makes its api consistent with other add endpoints (see
origin-visit-status-add as one example).

This is preparatory work towards removing origin-visit-upsert.

It's similar to origin-visit-upsert now but it does slighly more:

  1. it checks for origin existence (raise if unknown)
  2. it's able to either deal with visit with id (replayer case) and visit with no id (the existing use case)

It does also less by delegating the validation to the model instantiation
(prior to the call of the endpoint) which is a good thing.

This also drops the dateutil.parser we want to phase out.

Related to T2310

Test Plan

tox

Diff Detail

Repository
rDSTO Storage manager
Branch
origin-visit-add
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 12774
Build 19430: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 19429: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
3,917 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_kafka_writer::test_storage_direct_writer
kafka_prefix = 'jgpfxrwney', kafka_server = '127.0.0.1:43635' consumer = <cimpl.Consumer object at 0x7f0197d292f0>
3,007 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_replay::test_storage_play_with_collision
replayer_storage_and_client = (<swh.storage.in_memory.InMemoryStorage object at 0x7f018ffa6e48>, <swh.journal.client.JournalClient object at 0x7f018ff94f28>) caplog = <_pytest.logging.LogCaptureFixture object at 0x7f019086b0f0>
3,007 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_replay::test_storage_replayer
replayer_storage_and_client = (<swh.storage.in_memory.InMemoryStorage object at 0x7f018ff81a58>, <swh.journal.client.JournalClient object at 0x7f018ff9dfd0>) caplog = <_pytest.logging.LogCaptureFixture object at 0x7f018ff7c9b0>
2 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_retry::test_retrying_proxy_swh_storage_origin_visit_add
swh_storage = <swh.storage.validate.ValidatingProxyStorage object at 0x7f0190010780> sample_data = {'authority': [{'metadata': {'location': 'France'}, 'type': 'deposit', 'url': 'http://hal.inria.example.com/'}], 'cont...384>, 'target': b'12345678901234567890', 'type': 'dir'}), 'id': b'4\x013B2S1\x000\xf51\xe62\xa73\xff7\xc3\xa90'}], ...}
3 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_retry::test_retrying_proxy_swh_storage_origin_visit_add_failure
swh_storage = <swh.storage.validate.ValidatingProxyStorage object at 0x7f0194ae62e8> sample_data = {'authority': [{'metadata': {'location': 'France'}, 'type': 'deposit', 'url': 'http://hal.inria.example.com/'}], 'cont...384>, 'target': b'12345678901234567890', 'type': 'dir'}), 'id': b'4\x013B2S1\x000\xf51\xe62\xa73\xff7\xc3\xa90'}], ...} mocker = <pytest_mock.plugin.MockFixture object at 0x7f0194a4b2b0>
View Full Test Results (7 Failed · 759 Passed · 17 Skipped)

Event Timeline

ardumont created this revision.Jun 11 2020, 3:26 PM
ardumont edited the summary of this revision. (Show Details)Jun 11 2020, 3:27 PM
ardumont updated this revision to Diff 11569.Jun 11 2020, 3:32 PM
ardumont edited the summary of this revision. (Show Details)
  • Fix mispelled comment
  • Make sure we *mostly* write to the journal prior to the backend when possible (not possible for the pg backend in the case of new origin visit).
swh-public-ci added a comment.Jun 11 2020, 3:34 PM

Build has FAILED

Patch application report for D3262 (id=11568)

Rebasing onto 5d6163342f...

Current branch diff-target is up to date.
Changes applied before test
commit 2e88faeccc5d6cab044dcc83ab131fd92818a718
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 14:57:02 2020 +0200

    storage*: Align origin-visit-add to take iterable of OriginVisit objects
    
    This makes its api consistent with other add endpoints.
    
    This is preparatory work towards removing origin-visit-upsert.
    
    Related to T2310

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

Harbormaster failed remote builds in B12773: Diff 11568!Jun 11 2020, 3:34 PM
ardumont planned changes to this revision.Jun 11 2020, 3:38 PM
swh-public-ci added a comment.Jun 11 2020, 3:42 PM

Build has FAILED

Patch application report for D3262 (id=11569)

Rebasing onto 5d6163342f...

Current branch diff-target is up to date.
Changes applied before test
commit 73c45b82779da698b3f7f1bcdd1ebd67752fd801
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 14:57:02 2020 +0200

    storage*: Align origin-visit-add to take iterable of OriginVisit objects
    
    This makes its api consistent with other add endpoints.
    
    This is preparatory work towards removing origin-visit-upsert.
    
    Related to T2310

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

Harbormaster failed remote builds in B12774: Diff 11569!Jun 11 2020, 3:42 PM
ardumont updated this revision to Diff 11571.Jun 11 2020, 4:19 PM
  • Fix most replayer missing origin-visit-add calls

Expects tests to be a tad red again (replayer wise only) because of the
in-memory storage implementation on passing existing origin-visit... unsure as
how to properly deal with that one yet.

ardumont planned changes to this revision.Jun 11 2020, 4:19 PM
swh-public-ci added a comment.Jun 11 2020, 4:27 PM

Build has FAILED

Patch application report for D3262 (id=11571)

Rebasing onto 5d6163342f...

Current branch diff-target is up to date.
Changes applied before test
commit d95aeca3d79b59268322959cb058f876d10b93bd
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 16:18:01 2020 +0200

    in-memory: wip fix (unsure as what to do for the idempotency case for now)

commit 691cdc54a3fc78e8f281091d36df06b48d1da354
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 14:57:02 2020 +0200

    storage*: Align origin-visit-add to take iterable of OriginVisit objects
    
    This makes its api consistent with other add endpoints.
    
    This is preparatory work towards removing origin-visit-upsert.
    
    Related to T2310

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

Harbormaster failed remote builds in B12776: Diff 11571!Jun 11 2020, 4:27 PM
ardumont updated this revision to Diff 11572.Jun 11 2020, 5:08 PM

Fix replayer tests

ardumont edited the summary of this revision. (Show Details)Jun 11 2020, 5:11 PM
ardumont retitled this revision from storage*: Align origin-visit-add to take iterable of OriginVisit objects to storage*: Align origin-visit-add to take iterable of OriginVisit objects as input.Jun 11 2020, 5:13 PM
swh-public-ci added a comment.Jun 11 2020, 5:16 PM

Build is green

Patch application report for D3262 (id=11572)

Rebasing onto 5d6163342f...

Current branch diff-target is up to date.
Changes applied before test
commit ceed32bc9c95e2c997beaeae2f447253291e58cd
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 14:57:02 2020 +0200

    storage*: Align origin-visit-add to take iterable of OriginVisit objects
    
    This makes its api consistent with other add endpoints.
    
    This is preparatory work towards removing origin-visit-upsert.
    
    Related to T2310

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/257/ for more details.

Harbormaster completed remote builds in B12777: Diff 11572.Jun 11 2020, 5:16 PM
ardumont mentioned this in T2310: Make origin visits immutable.Jun 11 2020, 5:46 PM
vlorentz accepted this revision.Jun 11 2020, 6:12 PM
vlorentz added inline comments.
swh/storage/cassandra/storage.py
810

visit = attr.evolve(visit, visit=visit_id)

swh/storage/in_memory.py
817–819

same

swh/storage/storage.py
841

same

swh/storage/tests/test_replay.py
73–80 ↗(On Diff #11572)

cool

swh/storage/tests/test_storage.py
1623–1633

inconsistent names: expected_ori_visit_dict vs visit_status

1682–1686

nit: (origin_visit1, origin_visits) = swh_storage.origin_visit_add([visit1, visit2])

1683–1684

good

1768–1770

same

1991

may it still raise a ValueError?

1996

dead code

This revision is now accepted and ready to land.Jun 11 2020, 6:12 PM
ardumont added inline comments.Jun 11 2020, 6:22 PM
swh/storage/cassandra/storage.py
810

oh yeah! thanks!

swh/storage/tests/test_storage.py
1623–1633

yeah, i recall it was to avoid too long lines...or something,

i'll see what i can do.

1682–1686

right, i forgot to make a pass to check the ones i missed ;)

1991

no idea, i'll check.

ardumont marked 4 inline comments as done.Jun 11 2020, 6:29 PM
ardumont added inline comments.
swh/storage/tests/test_storage.py
1991

it's origin-visit-update here not add so i guess, yes it still raises.
Also, note that i will tear it down soon so don't be attached too much ;)

ardumont updated this revision to Diff 11576.Jun 11 2020, 6:31 PM
ardumont edited the summary of this revision. (Show Details)

Adapt according to review

ardumont edited the summary of this revision. (Show Details)Jun 11 2020, 6:31 PM
swh-public-ci added a comment.Jun 11 2020, 6:39 PM

Build is green

Patch application report for D3262 (id=11576)

Rebasing onto 5d6163342f...

Current branch diff-target is up to date.
Changes applied before test
commit 785e480ed1b54fde0a26094c92ea2583a3a95679
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 14:57:02 2020 +0200

    storage*: Align origin-visit-add to take iterable of OriginVisit objects
    
    This makes its api consistent with other add endpoints.
    
    This is preparatory work towards removing origin-visit-upsert.
    
    Related to T2310

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/258/ for more details.

Harbormaster completed remote builds in B12781: Diff 11576.Jun 11 2020, 6:39 PM
ardumont edited the summary of this revision. (Show Details)Jun 11 2020, 6:47 PM
ardumont updated this revision to Diff 11578.Jun 11 2020, 6:55 PM

Missed a spot ;)

ardumont added a child revision: D3264: Migrate to new storage.origin_visit_add endpoint.Jun 11 2020, 6:57 PM
ardumont added a child revision: D3265: tests: Migrate to new storage.origin_visit_add endpoint.
swh-public-ci added a comment.Jun 11 2020, 7:02 PM

Build has FAILED

Patch application report for D3262 (id=11578)

Rebasing onto 5d6163342f...

Current branch diff-target is up to date.
Changes applied before test
commit 37c45300bc44694fddf945bd70540b2ece5e81c3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 14:57:02 2020 +0200

    storage*: Align origin-visit-add to take iterable of OriginVisit objects
    
    This makes its api consistent with other add endpoints.
    
    This is preparatory work towards removing origin-visit-upsert.
    
    Related to T2310

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

Harbormaster failed remote builds in B12783: Diff 11578!Jun 11 2020, 7:02 PM
ardumont added a child revision: D3267: swh-web: Migrate to new storage.origin_visit_add endpoint.Jun 11 2020, 7:11 PM
swh-public-ci added a comment.Jun 11 2020, 7:24 PM

Build is green

Patch application report for D3262 (id=11578)

Rebasing onto 5d6163342f...

Current branch diff-target is up to date.
Changes applied before test
commit 37c45300bc44694fddf945bd70540b2ece5e81c3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jun 11 14:57:02 2020 +0200

    storage*: Align origin-visit-add to take iterable of OriginVisit objects
    
    This makes its api consistent with other add endpoints.
    
    This is preparatory work towards removing origin-visit-upsert.
    
    Related to T2310

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/260/ for more details.

Harbormaster completed remote builds in B12783: Diff 11578.Jun 11 2020, 7:24 PM
Closed by commit rDSTO37c45300bc44: storage*: Align origin-visit-add to take iterable of OriginVisit objects (authored by ardumont). · Explain WhyJun 12 2020, 9:06 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDSTO37c45300bc44: storage*: Align origin-visit-add to take iterable of OriginVisit objects.

Revision Contents
Changeset List

PathSize
1 line
swh/
storage/
cassandra/
65 lines
76 lines
20 lines
8 lines
80 lines
tests/
422 lines
12 lines

Diff 11569

View Options

requirements.txt

Loading...
View Options

swh/storage/cassandra/storage.py

Loading...
View Options

swh/storage/in_memory.py

Loading...
View Options

swh/storage/interface.py

Loading...
View Options

swh/storage/retry.py

Loading...
View Options

swh/storage/storage.py

Loading...
View Options

swh/storage/tests/test_storage.py

Loading...
View Options

swh/storage/validate.py

Loading...
About · Developer information · Legal