Differential D7943
Revert "cli.db: Use attribute current_version instead of undeclared getter" Authored by ardumont on Jun 2 2022, 11:42 AM. Tags None Subscribers None
Details
This reverts commit 5cda0ca626010cccc7e7f3f73fbfb1b20702ac40 (D7907) which is not the proper The proper fix plan becomes:
default implementation in BaseDb [1] to actually expose that get_current_version (that [1] does both by updating swh.core.db
Diff Detail
Event TimelineComment Actions Build is green Patch application report for D7943 (id=28611)Rebasing onto 4fc5f601b6... Current branch diff-target is up to date. Changes applied before testcommit 1ebd38d48e5d5d37c138592639a03ed647fe6360
Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
Date: Thu Jun 2 11:40:00 2022 +0200
Revert "cli.db: Use attribute current_version instead of undeclared getter"
This reverts commit 5cda0ca626010cccc7e7f3f73fbfb1b20702ac40. which is not the proper
fix.
The proper fix plan becomes:
- fix documentation to explicit the get_current_version intention
- either fix swh-scrubber or provide a default implementation in BaseDb to actually
expose that get_current_version (that can then be overriden if something specific needs
to be developed for a new datastore).
Related to T4284See https://jenkins.softwareheritage.org/job/DCORE/job/tests-on-diff/438/ for more details. Comment Actions Nope, it's fine without this. 11:45 <+ardumont> although for storage, that would have worked 11:45 <+ardumont> well it's working since the implementation is returning that value 11:46 <+ardumont> https://forge.softwareheritage.org/source/swh-storage/browse/master/swh/storage/postgresql/storage.py$208-211 11:46 <+ardumont> which is probably not the implementation you want given what you said before 11:47 <+ardumont> mmm same for scheduler https://forge.softwareheritage.org/source/swh-scheduler/browse/master/swh/scheduler/backend.py$76-78 11:48 <+ardumont> douardda: ^ there is something off between what you said and what's currently implemented 11:48 <+ardumont> The current get_current_version() method implementation are "all" (storage, scheduler so far) returning the current_version attribute 11:48 <+ardumont> so my code actually work (without reverting it) 11:49 <+ardumont> and same for indexer, https://forge.softwareheritage.org/source/swh-indexer/browse/master/swh/indexer/storage/__init__.py$155-157 11:49 <+ardumont> so i stand by my commit Comment Actions Open it back, it's required in the end. Another fix will happen to propose a default Comment Actions Build is green Patch application report for D7943 (id=28626)Rebasing onto e1a1d84eb4... Current branch diff-target is up to date. Changes applied before testcommit 1096de5a182968cebbbd98d921814fc332095710
Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
Date: Thu Jun 2 11:40:00 2022 +0200
Revert "cli.db: Use attribute current_version instead of undeclared getter"
This reverts commit 5cda0ca626010cccc7e7f3f73fbfb1b20702ac40. which is not the proper
fix.
The proper fix plan becomes:
- fix documentation to explicit the get_current_version intention
- either fix swh-scrubber or provide a default implementation in BaseDb to actually
expose that get_current_version (that can then be overriden if something specific needs
to be developed for a new datastore).
Related to T4284See https://jenkins.softwareheritage.org/job/DCORE/job/tests-on-diff/442/ for more details. Comment Actions Without this diff, storage and indexer are actually broken since their datastore is missing the current_version attribute. Diffs incoming [1] D7943#206331 |