Page MenuHomeSoftware Heritage
Differential D7907

cli.db: Use attribute current_version instead of undeclared getter
ClosedPublic
Actions

Authored by ardumont on May 30 2022, 4:43 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T4284: scrubber does not comply to what's expected by the swh db tooling
Commits
rDCORE5cda0ca62601: cli.db: Use attribute current_version instead of undeclared getter
Summary

I have no idea why both exist. But this centralized one (current_version) is declared on
most swh modules vs the other method which is not [2]

[1]

$SWH_ENVIRONMENT_HOME/swh-indexer/swh/indexer/storage/db.py:    current_version = 133
$SWH_ENVIRONMENT_HOME/swh-scheduler/swh/scheduler/backend.py:    current_version = 33
$SWH_ENVIRONMENT_HOME/swh-scrubber/swh/scrubber/db.py:    current_version = 2
$SWH_ENVIRONMENT_HOME/swh-storage/swh/storage/postgresql/db.py:    current_version = 182
$SWH_ENVIRONMENT_HOME/swh-vault/swh/vault/backend.py:    current_version = 4

[2]

grep -r "get_current_version(" $SWH_ENVIRONMENT_HOME/*/swh/
$SWH_ENVIRONMENT_HOME/swh-indexer/swh/indexer/storage/__init__.py:    def get_current_version(self, *, db=None, cur=None):
$SWH_ENVIRONMENT_HOME/swh-scheduler/swh/scheduler/backend.py:    def get_current_version(self):
$SWH_ENVIRONMENT_HOME/swh-storage/swh/storage/postgresql/storage.py:    def get_current_version(self, *, db: Db, cur=None):

Related to T4284
Supersedes D7906

Test Plan

Patched on scrubber0.staging and now the cli works! [1]

[1]

swhworker@scrubber0:~$ swh db --config-file config.yml version scrubber
module: scrubber
current code version: 2
version: 1

Diff Detail

Unit TestsFailed
View All

TimeTest
884 msJenkins > .tox.py3-core-db-server-github-slow-cover.lib.python3.7.site-packages.swh.core.db.tests.test_cli::test_cli_swh_db_create_and_init_db_new_api
cli_runner = <click.testing.CliRunner object at 0x7f9b0dfb1630> postgresql = <connection object at 0x7f9b10c0f408; dsn: 'user=postgres password=xxx dbname=tests host=127.0.0.1 port=18610 options=''', closed: 0> mock_import_swhmodule = <function mock_import_swhmodule.<locals>.import_swhmodule_mock at 0x7f9b0dfeb6a8>
739 msJenkins > .tox.py3-core-db-server-github-slow-cover.lib.python3.7.site-packages.swh.core.db.tests.test_cli::test_cli_swh_db_upgrade_new_api
cli_runner = <click.testing.CliRunner object at 0x7f9b0dfc9d68> postgresql = <connection object at 0x7f9b1163d188; dsn: 'user=postgres password=xxx dbname=tests host=127.0.0.1 port=18610 options=''', closed: 0> datadir = '/var/lib/jenkins/workspace/DCORE/tests-on-diff/.tox/py3-core-db-server-github-slow-cover/lib/python3.7/site-packages/swh/core/db/tests/data'
1 msJenkins > .tox.py3-core-db-server-github-slow-cover.lib.python3.7.site-packages.swh.core.api.tests.test_async::test_async_decode_data_empty_cases[None]
1 msJenkins > .tox.py3-core-db-server-github-slow-cover.lib.python3.7.site-packages.swh.core.api.tests.test_async::test_async_decode_data_empty_cases[]
1 msJenkins > .tox.py3-core-db-server-github-slow-cover.lib.python3.7.site-packages.swh.core.api.tests.test_async::test_async_decode_data_empty_cases[data2]
View Full Test Results (2 Failed · 296 Passed · 1 Skipped)

Event Timeline

ardumont created this revision.May 30 2022, 4:43 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMay 30 2022, 4:43 PM
swh-public-ci added a comment.May 30 2022, 4:45 PM

Build has FAILED

Patch application report for D7907 (id=28511)

Rebasing onto f18016af5c...

Current branch diff-target is up to date.
Changes applied before test
commit c52516feac901aa72cce833bdd9d06ebb01bfd52
Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
Date:   Mon May 30 16:14:06 2022 +0200

    cli.db: Use attribute current_version instead of undeclared getter
    
    Related to T4284

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

Harbormaster returned this revision to the author for changes because remote builds failed.May 30 2022, 4:45 PM
Harbormaster failed remote builds in B29601: Diff 28511!
ardumont updated this revision to Diff 28513.May 30 2022, 4:56 PM

Fix tests

swh-public-ci added a comment.May 30 2022, 4:58 PM

Build is green

Patch application report for D7907 (id=28513)

Rebasing onto f18016af5c...

Current branch diff-target is up to date.
Changes applied before test
commit 5cda0ca626010cccc7e7f3f73fbfb1b20702ac40
Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
Date:   Mon May 30 16:14:06 2022 +0200

    cli.db: Use attribute current_version instead of undeclared getter
    
    Related to T4284

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

Harbormaster completed remote builds in B29603: Diff 28513.May 30 2022, 4:58 PM
ardumont requested review of this revision.May 30 2022, 4:58 PM
ardumont edited the summary of this revision. (Show Details)May 30 2022, 4:58 PM
ardumont edited the summary of this revision. (Show Details)May 30 2022, 5:01 PM
ardumont mentioned this in D7906: db: Provide a default get_current_version method to db classes.
vlorentz accepted this revision.May 30 2022, 5:04 PM
vlorentz added a subscriber: vlorentz.

thx

This revision is now accepted and ready to land.May 30 2022, 5:04 PM
ardumont edited the test plan for this revision. (Show Details)May 30 2022, 5:05 PM
Closed by commit rDCORE5cda0ca62601: cli.db: Use attribute current_version instead of undeclared getter (authored by ardumont). · Explain WhyMay 30 2022, 5:06 PM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDCORE5cda0ca62601: cli.db: Use attribute current_version instead of undeclared getter.
ardumont added a reverting change: D7943: Revert "cli.db: Use attribute current_version instead of undeclared getter".Jun 2 2022, 11:42 AM
ardumont mentioned this in D7949: db.BaseDb: Propose default get_current_version method implementation.Jun 2 2022, 5:23 PM

Revision Contents
Changeset List

PathSize
swh/
core/
cli/
14 lines

Diff 28511

View Options

swh/core/cli/db.py

Loading...
About · Developer information · Legal