Page MenuHomeSoftware Heritage

Add an new origin visit info model object and related backend api
ClosedPublic

Authored by vsellier on Tue, Jan 12, 12:16 PM.

Diff Detail

Repository
rDSCH Scheduling utilities
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build has FAILED

Patch application report for D4838 (id=17135)

Rebasing onto 619100eaf2...

Current branch diff-target is up to date.
Changes applied before test
commit 1bfbc8f4981bc034d358217f3d522b0bdc25a1e4
Author: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date:   Tue Jan 12 12:13:07 2021 +0100

    Add an new origin visit info model object and related backend api
    
    Upsert and Read methods
    
    Related to T2443

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

Harbormaster returned this revision to the author for changes because remote builds failed.Tue, Jan 12, 12:17 PM
Harbormaster failed remote builds in B18279: Diff 17135!

Build is green

Patch application report for D4838 (id=17138)

Rebasing onto 619100eaf2...

Current branch diff-target is up to date.
Changes applied before test
commit cd081501aec6359685df61c6f6743c1c191a19e2
Author: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date:   Tue Jan 12 12:13:07 2021 +0100

    Add an new origin visit info model object and related backend api
    
    Upsert and Read methods
    
    Related to T2443

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

vlorentz added a subscriber: vlorentz.

I don't like the name "info", it's too generic. What about "origin_visit_stats"? (still too generic, but less so)

sql/updates/19.sql
7–9

Could you rename them to last_eventful, last_uneventful, and last_failed?

swh/scheduler/backend.py
765–771

these lines are too long, could you dedent them?

(I also remove duplicate spaces and upper-cased as in the suggested change)

swh/scheduler/sql/30-schema.sql
14

thx :)

This revision now requires changes to proceed.Tue, Jan 12, 12:51 PM

Adapt according to review

  • change *Info -> *Stats
  • add last_ before timestamps fields

Build is green

Patch application report for D4838 (id=17149)

Rebasing onto b13cb1f2de...

First, rewinding head to replay your work on top of it...
Applying: Add an new origin visit info model object and related backend api
Using index info to reconstruct a base tree...
M	swh/scheduler/backend.py
M	swh/scheduler/interface.py
M	swh/scheduler/model.py
M	swh/scheduler/sql/30-schema.sql
M	swh/scheduler/tests/test_api_client.py
M	swh/scheduler/tests/test_scheduler.py
Falling back to patching base and 3-way merge...
Auto-merging swh/scheduler/tests/test_scheduler.py
Auto-merging swh/scheduler/tests/test_api_client.py
Auto-merging swh/scheduler/sql/30-schema.sql
CONFLICT (content): Merge conflict in swh/scheduler/sql/30-schema.sql
Auto-merging swh/scheduler/model.py
Auto-merging swh/scheduler/interface.py
Auto-merging swh/scheduler/backend.py
Patch failed at 0001 Add an new origin visit info model object and related backend api

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto b13cb1f2de...

Already up to date.
Changes applied before test
commit 593186d898f3a60cbd007210276af28789310ec8
Author: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date:   Tue Jan 12 12:13:07 2021 +0100

    Add an new origin visit info model object and related backend api
    
    Upsert and Read methods
    
    Related to T2443

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

Build is green

Patch application report for D4838 (id=17151)

Rebasing onto b13cb1f2de...

Current branch diff-target is up to date.
Changes applied before test
commit a62003397d6eb1d814aebf9816e5e0495337b2bf
Author: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date:   Tue Jan 12 12:13:07 2021 +0100

    Add an new origin visit info model object and related backend api
    
    Upsert and Read methods
    
    Related to T2443

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

This revision is now accepted and ready to land.Wed, Jan 13, 9:40 AM