Page MenuHomeSoftware Heritage
Differential D3831

Check for db version mismatch in PgStorage.check_config()
ClosedPublic
Actions

Authored by douardda on Aug 24 2020, 2:50 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Commits
rDSTO4dd9597723f0: Check for db version mismatch in PgStorage.check_config()
Summary

Depends on D3814.

Diff Detail

Event Timeline

douardda created this revision.Aug 24 2020, 2:50 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptAug 24 2020, 2:50 PM
douardda added a child revision: D3832: Add support for a new "check_config" config option in get_storage().Aug 24 2020, 2:51 PM
swh-public-ci added a comment.Aug 24 2020, 2:55 PM

Build is green

Patch application report for D3831 (id=13485)

Could not rebase; Attempt merge onto d1f19e97c3...

Updating d1f19e97..0dbe0e64
Fast-forward
 swh/storage/postgresql/db.py         | 12 ++++++++++++
 swh/storage/postgresql/storage.py    |  3 +++
 swh/storage/pytest_plugin.py         |  2 +-
 swh/storage/tests/test_postgresql.py | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
Changes applied before test
commit 0dbe0e644dbad7cd0b1f30b1370682fe61558fde
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 15:43:35 2020 +0200

    Check for db version mismatch in PgStorage.check_config()

commit cba6959b163ce0711b3b490201dd6f414843396e
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 12:00:37 2020 +0200

    Add a check_dbversion() method to the Db class
    
    This method compares the version stored in the database in the `dbversion`
    table with the currently declared version.
    
    This current version is declared as a simple `current_version` attribute
    on the Db class. **It must be updated jointly in 30-swh-schema.sql** when
    modifying the db schema. Note that if this is forgotten, the added test
    `test_dbversion` should fail.
    
    Related to T2525.

commit 346ad9c4197e57d377fed351b2353e14af486995
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 11:55:56 2020 +0200

    Fix pytest_plugin's database janitor: do not truncate the dbversion table

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

Harbormaster completed remote builds in B14745: Diff 13485.Aug 24 2020, 2:55 PM
ardumont accepted this revision.Aug 24 2020, 3:33 PM
This revision is now accepted and ready to land.Aug 24 2020, 3:33 PM
douardda updated this revision to Diff 13490.Aug 24 2020, 4:41 PM

rebase

douardda updated this revision to Diff 13494.Aug 24 2020, 4:49 PM

rebase

swh-public-ci added a comment.Aug 24 2020, 4:49 PM

Build is green

Patch application report for D3831 (id=13490)

Could not rebase; Attempt merge onto f570f9336c...

Merge made by the 'recursive' strategy.
 swh/storage/postgresql/db.py         | 12 ++++++++++++
 swh/storage/postgresql/storage.py    |  3 +++
 swh/storage/pytest_plugin.py         |  2 +-
 swh/storage/tests/test_cli.py        | 10 +++++-----
 swh/storage/tests/test_postgresql.py | 19 +++++++++++++++++++
 5 files changed, 40 insertions(+), 6 deletions(-)
Changes applied before test
commit 90c686b41b4eccac870160728bed4c0ba3d6e779
Merge: f570f933 c90c3582
Author: Jenkins user <jenkins@localhost>
Date:   Mon Aug 24 14:45:02 2020 +0000

    Merge branch 'diff-target' into HEAD

commit c90c35826589b64e9e4761dd51c623a7d1245c32
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 15:43:35 2020 +0200

    Check for db version mismatch in PgStorage.check_config()

commit 80e756b0662108f94e64eb7eccf3a6b2ad4a61b7
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 12:00:37 2020 +0200

    Add a check_dbversion() method to the Db class
    
    This method compares the version stored in the database in the `dbversion`
    table with the currently declared version.
    
    This current version is declared as a simple `current_version` attribute
    on the Db class. **It must be updated jointly in 30-swh-schema.sql** when
    modifying the db schema. Note that if this is forgotten, the added test
    `test_dbversion` should fail.
    
    Related to T2525.

commit 346ad9c4197e57d377fed351b2353e14af486995
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 11:55:56 2020 +0200

    Fix pytest_plugin's database janitor: do not truncate the dbversion table

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

Harbormaster completed remote builds in B14750: Diff 13490.Aug 24 2020, 4:49 PM
douardda updated this revision to Diff 13499.Aug 24 2020, 5:00 PM

rebase

swh-public-ci added a comment.Aug 24 2020, 5:07 PM

Build is green

Patch application report for D3831 (id=13494)

Could not rebase; Attempt merge onto f570f9336c...

Merge made by the 'recursive' strategy.
 swh/storage/postgresql/db.py         | 12 ++++++++++++
 swh/storage/postgresql/storage.py    |  3 +++
 swh/storage/pytest_plugin.py         |  2 +-
 swh/storage/tests/test_postgresql.py | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
Changes applied before test
commit a8226e8148d8bf7295d09527c3d9499f82c02f0c
Merge: f570f933 f7434a8c
Author: Jenkins user <jenkins@localhost>
Date:   Mon Aug 24 15:03:33 2020 +0000

    Merge branch 'diff-target' into HEAD

commit f7434a8cb9c1ecd72bc716ed6dd3cf5f05ad6893
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 15:43:35 2020 +0200

    Check for db version mismatch in PgStorage.check_config()

commit d0052506f4deb165dd06d28f415787e2cd31c8ee
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 12:00:37 2020 +0200

    Add a check_dbversion() method to the Db class
    
    This method compares the version stored in the database in the `dbversion`
    table with the currently declared version.
    
    This current version is declared as a simple `current_version` attribute
    on the Db class. **It must be updated jointly in 30-swh-schema.sql** when
    modifying the db schema. Note that if this is forgotten, the added test
    `test_dbversion` should fail.
    
    Related to T2525.

commit 346ad9c4197e57d377fed351b2353e14af486995
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 11:55:56 2020 +0200

    Fix pytest_plugin's database janitor: do not truncate the dbversion table

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

Harbormaster completed remote builds in B14754: Diff 13494.Aug 24 2020, 5:07 PM
This revision was landed with ongoing or failed builds.Aug 24 2020, 5:24 PM
Closed by commit rDSTO4dd9597723f0: Check for db version mismatch in PgStorage.check_config() (authored by douardda). · Explain Why
This revision was automatically updated to reflect the committed changes.
douardda added a commit: rDSTO4dd9597723f0: Check for db version mismatch in PgStorage.check_config().
swh-public-ci added a comment.Aug 24 2020, 5:25 PM

Build is green

Patch application report for D3831 (id=13499)

Could not rebase; Attempt merge onto f570f9336c...

Updating f570f933..4dd95977
Fast-forward
 swh/storage/postgresql/db.py         | 12 ++++++++++++
 swh/storage/postgresql/storage.py    |  3 +++
 swh/storage/pytest_plugin.py         |  2 +-
 swh/storage/tests/test_postgresql.py | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
Changes applied before test
commit 4dd9597723f063b5197445a8d5b0c8cc24c73dde
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 15:43:35 2020 +0200

    Check for db version mismatch in PgStorage.check_config()

commit c16ff506ad52abb926c656cb6cd0872ebcf9bf58
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 12:00:37 2020 +0200

    Add a check_dbversion() method to the Db class
    
    This method compares the version stored in the database in the `dbversion`
    table with the currently declared version.
    
    This current version is declared as a simple `current_version` attribute
    on the Db class. **It must be updated jointly in 30-swh-schema.sql** when
    modifying the db schema. Note that if this is forgotten, the added test
    `test_dbversion` should fail.
    
    Related to T2525.

commit 629d2d10ee97ddca057858d5a2fe2d6b52f6edd7
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Aug 20 11:55:56 2020 +0200

    Fix pytest_plugin's database janitor: do not truncate the dbversion table

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

Harbormaster completed remote builds in B14759: Diff 13499.Aug 24 2020, 5:25 PM

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
storage/
postgresql/
3 lines95%
Loading...
tests/
9 lines98%
Loading...

Diff 13485

View Options

swh/storage/postgresql/storage.py

Loading...
View Options

swh/storage/tests/test_postgresql.py

Loading...
About · Developer information · Legal