Page MenuHomeSoftware Heritage
Differential D4914

simulator: stop using the database as a cache for origin data
ClosedPublic
Actions

Authored by vlorentz on Jan 21 2021, 6:07 PM.

Details

Reviewers
olasd
douardda
Group Reviewers
Reviewers
Commits
rDSCH889839446eb8: simulator: stop using the database as a cache for origin data
Summary

This was a significant bottleneck of the simulator. To work around this,
we:

  • Generate snapshot ids consistently in the OriginModel
  • Cache the origin data locally in the simulator, to compute the eventfulness of visits
  • Cache the last visit time for all origins to compute the estimated run time of visit tasks.

Diff Detail

Event Timeline

vlorentz created this revision.Jan 21 2021, 6:07 PM
swh-public-ci added a comment.Jan 21 2021, 6:20 PM

Build is green

Patch application report for D4914 (id=17493)

Could not rebase; Attempt merge onto 03460207a1...

Updating 0346020..7afb0a4
Fast-forward
 swh/scheduler/backend.py                    | 107 ++++++++++++++----
 swh/scheduler/interface.py                  |  45 ++++++--
 swh/scheduler/model.py                      |  33 +-----
 swh/scheduler/simulator/__init__.py         |  25 +++--
 swh/scheduler/simulator/common.py           |  18 +++-
 swh/scheduler/simulator/origin_scheduler.py |   2 +-
 swh/scheduler/simulator/origins.py          | 162 +++++++++++++++++++++-------
 swh/scheduler/tests/test_scheduler.py       |  93 +++++++++++++---
 swh/scheduler/tests/test_simulator.py       |   6 +-
 9 files changed, 362 insertions(+), 129 deletions(-)
Changes applied before test
commit 7afb0a498432d1e2641abf3a9de859354699c5c4
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:45:23 2021 +0100

    simulator: stop using the database as a cache for origin data
    
    This was a significant bottleneck of the simulator. To work around this,
    we:
    
     - Generate snapshot ids consistently in the OriginModel
     - Cache the origin data locally in the simulator, to compute the
       eventfulness of visits
     - Cache the last visit time for all origins to compute the estimated
       run time of visit tasks.

commit 8e7377d8af45ef8e8234b57dc6a16be75dd74ac5
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 17:38:41 2021 +0100

    simulator: add a trivial heartbeat process to show progress
    
    For now, this process only writes a log every simulated day.

commit ba303f946ecd3e15e58de0072ce71b50aa423d59
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:31:43 2021 +0100

    grab_next_visits: don't re-schedule visits too fast
    
    The earlier implementation would just schedule new visits for origins
    forever, regardless of whether they were already scheduled or not.

commit 808ae6851faee9b633e773f9150d360cdb927146
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:29:45 2021 +0100

    Allow overriding the timestamp of grab_next_visits
    
    This makes the simulator behavior more consistent with reality.

commit 9943195d31c51a44325cba09d07fb6e904d45a00
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:27:40 2021 +0100

    Construct grab_next_visits query arguments incrementally

commit 72070b7bf628788b6872e90a3f8ac8f0c01b70d9
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:57:42 2021 +0100

    simulator: add simple lister simulation

commit 1f1aad459c4b0740ecbe96e9809e4b31f66bf999
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:54:53 2021 +0100

    Factor out ListedOrigin generation to use the OriginModel
    
    This generates consistent last_update values according to the model and
    simulated time.

commit b93aa5be2c2d5dc2130e1027698f3e1255052d8d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 13:01:53 2021 +0100

    Make PaginatedListedOriginList a concretization of PagedResult
    
    1. consistent with swh-storage and swh-indexer-storage
    2. we can use swh.core.api.classes.stream_results on scheduler.get_listed_origins.

commit 2f47936731cf438a5195978a2af3250597b693b5
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Wed Jan 20 17:29:16 2021 +0100

    Add scheduling policy for already visited origins with known last update
    
    This policy schedules origins by decreasing order of "visit lag" (that
    is, origins with the most lag are scheduled first).

commit acad712ad3f71f88f99e45e9b4f571ad751945dc
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Wed Jan 20 17:25:46 2021 +0100

    Add scheduling policy for never visited origins
    
    This policy orders never visited origins by increasing date of last
    update (scheduling the "oldest" never visited origins first).

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

Harbormaster completed remote builds in B18627: Diff 17493.Jan 21 2021, 6:20 PM
vlorentz requested review of this revision.Jan 21 2021, 6:20 PM
vlorentz updated this revision to Diff 17524.Jan 22 2021, 12:26 PM

rebase

swh-public-ci added a comment.Jan 22 2021, 12:30 PM

Build is green

Patch application report for D4914 (id=17524)

Could not rebase; Attempt merge onto b93aa5be2c...

Updating b93aa5b..946c5c2
Fast-forward
 swh/scheduler/backend.py                    |  61 +++++++++--
 swh/scheduler/interface.py                  |  15 ++-
 swh/scheduler/simulator/__init__.py         |  18 ++--
 swh/scheduler/simulator/common.py           |  18 +++-
 swh/scheduler/simulator/origin_scheduler.py |   2 +-
 swh/scheduler/simulator/origins.py          | 162 +++++++++++++++++++++-------
 swh/scheduler/tests/test_scheduler.py       |  21 +++-
 7 files changed, 232 insertions(+), 65 deletions(-)
Changes applied before test
commit 946c5c2594aa4ae6bfd9406e7ac0cb6fa6b7e199
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:45:23 2021 +0100

    simulator: stop using the database as a cache for origin data
    
    This was a significant bottleneck of the simulator. To work around this,
    we:
    
     - Generate snapshot ids consistently in the OriginModel
     - Cache the origin data locally in the simulator, to compute the
       eventfulness of visits
     - Cache the last visit time for all origins to compute the estimated
       run time of visit tasks.

commit f5af170b5f8d6bc36b56aa007db613bcc5754804
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:31:43 2021 +0100

    grab_next_visits: don't re-schedule visits too fast
    
    The earlier implementation would just schedule new visits for origins
    forever, regardless of whether they were already scheduled or not.

commit 808ae6851faee9b633e773f9150d360cdb927146
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:29:45 2021 +0100

    Allow overriding the timestamp of grab_next_visits
    
    This makes the simulator behavior more consistent with reality.

commit 9943195d31c51a44325cba09d07fb6e904d45a00
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:27:40 2021 +0100

    Construct grab_next_visits query arguments incrementally

commit 72070b7bf628788b6872e90a3f8ac8f0c01b70d9
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:57:42 2021 +0100

    simulator: add simple lister simulation

commit 1f1aad459c4b0740ecbe96e9809e4b31f66bf999
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:54:53 2021 +0100

    Factor out ListedOrigin generation to use the OriginModel
    
    This generates consistent last_update values according to the model and
    simulated time.

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

Harbormaster completed remote builds in B18656: Diff 17524.Jan 22 2021, 12:30 PM
vlorentz updated this revision to Diff 17571.Jan 25 2021, 2:40 PM

rebase

swh-public-ci added a comment.Jan 25 2021, 2:51 PM

Build is green

Patch application report for D4914 (id=17571)

Could not rebase; Attempt merge onto 2906b4e8a0...

Updating 2906b4e..31e37e8
Fast-forward
 swh/scheduler/backend.py                    |  61 ++++++++--
 swh/scheduler/interface.py                  |  15 ++-
 swh/scheduler/simulator/__init__.py         |  18 ++-
 swh/scheduler/simulator/common.py           |  18 ++-
 swh/scheduler/simulator/origin_scheduler.py |   2 +-
 swh/scheduler/simulator/origins.py          | 171 +++++++++++++++++++++-------
 swh/scheduler/tests/test_scheduler.py       |  21 +++-
 7 files changed, 240 insertions(+), 66 deletions(-)
Changes applied before test
commit 31e37e80927995902c6a3550166f7b2e3336b71c
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:45:23 2021 +0100

    simulator: stop using the database as a cache for origin data
    
    This was a significant bottleneck of the simulator. To work around this,
    we:
    
     - Generate snapshot ids consistently in the OriginModel
     - Cache the origin data locally in the simulator, to compute the
       eventfulness of visits
     - Cache the last visit time for all origins to compute the estimated
       run time of visit tasks.

commit 6784a19cdc38b8f97aa4f9c1da9859ece24865f1
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:31:43 2021 +0100

    grab_next_visits: don't re-schedule visits too fast
    
    The earlier implementation would just schedule new visits for origins
    forever, regardless of whether they were already scheduled or not.

commit 09a8768c30dc335afccde4df046b371a274cb2f9
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:29:45 2021 +0100

    Allow overriding the timestamp of grab_next_visits
    
    This makes the simulator behavior more consistent with reality.

commit a2dc72474056c2f20e255acf13ec3e662e1aad7a
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:27:40 2021 +0100

    Construct grab_next_visits query arguments incrementally

commit e5709214b4917a5fe3634d040da7a061f5978f66
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:57:42 2021 +0100

    simulator: add simple lister simulation

commit 7af98e2bc048c6946679e7d95cf8620e4a0ee4bf
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:54:53 2021 +0100

    Factor out ListedOrigin generation to use the OriginModel
    
    This generates consistent last_update values according to the model and
    simulated time.

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

Harbormaster completed remote builds in B18706: Diff 17571.Jan 25 2021, 2:51 PM
douardda added a subscriber: douardda.Jan 26 2021, 9:48 AM

Something I don't understand: why do you need to keep both _visit_times and latest_snapshots in "caches" when a snapshot is derived from this visit time (and visit type and origin)?

swh/scheduler/simulator/origins.py
26

what is this global var for?

107

shouldn't it be get_current_snapshot_id instead? to me, the name suggest it returns a Snapshot object.

douardda added a comment.Jan 26 2021, 9:50 AM

And once again, this "cache" behavior makes the simulator unable to run "forever" (it will eat RAM). Maybe it's an assumed design choice, but please document it somewhere.

vlorentz marked 2 inline comments as done.Jan 26 2021, 1:30 PM
In D4914#124243, @douardda wrote:

Something I don't understand: why do you need to keep both _visit_times and latest_snapshots in "caches" when a snapshot is derived from this visit time (and visit type and origin)?

because snapshot ids being derived from the visit time is an internal detail of the origin model implementation; and SimulationReport should not depend on that.

vlorentz updated this revision to Diff 17611.Jan 26 2021, 1:32 PM
  • rebase (including documentation of RAM usage)
  • document _visit_times
  • rename get_current_snapshot to get_current_snapshot_id
swh-public-ci added a comment.Jan 26 2021, 1:36 PM

Build is green

Patch application report for D4914 (id=17611)

Could not rebase; Attempt merge onto 2906b4e8a0...

Updating 2906b4e..8898394
Fast-forward
 docs/simulator.rst                          |  15 +++
 swh/scheduler/backend.py                    |  61 ++++++++--
 swh/scheduler/interface.py                  |  15 ++-
 swh/scheduler/simulator/__init__.py         |  18 ++-
 swh/scheduler/simulator/common.py           |  18 ++-
 swh/scheduler/simulator/origin_scheduler.py |   2 +-
 swh/scheduler/simulator/origins.py          | 173 ++++++++++++++++++++++------
 swh/scheduler/tests/test_scheduler.py       |  21 +++-
 8 files changed, 257 insertions(+), 66 deletions(-)
Changes applied before test
commit 889839446eb8645a5520237513a54c892d3a3104
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:45:23 2021 +0100

    simulator: stop using the database as a cache for origin data
    
    This was a significant bottleneck of the simulator. To work around this,
    we:
    
     - Generate snapshot ids consistently in the OriginModel
     - Cache the origin data locally in the simulator, to compute the
       eventfulness of visits
     - Cache the last visit time for all origins to compute the estimated
       run time of visit tasks.

commit c92ead5875ecfd96a164eec1803398adec6eb8a8
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:31:43 2021 +0100

    grab_next_visits: don't re-schedule visits too fast
    
    The earlier implementation would just schedule new visits for origins
    forever, regardless of whether they were already scheduled or not.

commit 2b39cbcabf9960c1f660442e15f6c17654aec9e2
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:29:45 2021 +0100

    Allow overriding the timestamp of grab_next_visits
    
    This makes the simulator behavior more consistent with reality.

commit 7ffbdd1b3eb579f43e8913ea11cfd916b2f3c457
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Jan 21 17:27:40 2021 +0100

    Construct grab_next_visits query arguments incrementally

commit ea068b46a89e07c60ad1233afd36afc6bb29031e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:57:42 2021 +0100

    simulator: add simple lister simulation

commit 7af98e2bc048c6946679e7d95cf8620e4a0ee4bf
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Jan 21 14:54:53 2021 +0100

    Factor out ListedOrigin generation to use the OriginModel
    
    This generates consistent last_update values according to the model and
    simulated time.

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

Harbormaster completed remote builds in B18749: Diff 17611.Jan 26 2021, 1:36 PM
douardda accepted this revision.Jan 27 2021, 3:48 PM
This revision is now accepted and ready to land.Jan 27 2021, 3:48 PM
Closed by commit rDSCH889839446eb8: simulator: stop using the database as a cache for origin data (authored by olasd, committed by vlorentz). · Explain WhyJan 29 2021, 10:00 AM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDSCH889839446eb8: simulator: stop using the database as a cache for origin data.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
scheduler/
simulator/
18 lines98%
Loading...
87 lines97%
Loading...

Diff 17524

View Options

swh/scheduler/simulator/common.py

Loading...
View Options

swh/scheduler/simulator/origins.py

Loading...
About · Developer information · Legal