Fix: Prevent duplicate AMRFinderPlus database paths#7949
Open
jakobnissen wants to merge 3 commits intogalaxyproject:mainfrom
Open
Fix: Prevent duplicate AMRFinderPlus database paths#7949jakobnissen wants to merge 3 commits intogalaxyproject:mainfrom
jakobnissen wants to merge 3 commits intogalaxyproject:mainfrom
Conversation
Include db_version in data-manager output rows and make reruns skip databases whose stable data-table value is already registered. Bump the data-manager Galaxy version suffix once for the combined data-manager changes.
Filter duplicate database names in the wrapper data-table options and add a regression fixture/assertion for comma-joined database paths. Bump only the Galaxy build suffix for the wrapper.
The data manager exposes AMRFinderPlus database 4.0, but amrfindeplus itself is still tied to the v3. Because 4.0 was the first select option, tests that did not explicitly set a database version started exercising the unsupported v4 path and the duplicate-database test compared a known 3.12 value against a selected 4.0 database. Explicitly select the 3.12 test databases in the existing tests and remove the premature v4 data-manager test case. This keeps v4 available from the data manager, while avoiding attempting to test an unready end-to-end path.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains four fixes to AMRFinderPlus and its database manager, fixing three separate bugs. They are made as three separate commits which can be reviewed independently.
The background is that we experienced AMRFinderPlus job failures. The executed command-line contained the option
--database '/users/data/Services/galaxy/server/tool-data/amrfinderplus-db/amrfinderplus_V3.12_2024-05-02.2,/users/data/Services/galaxy/server/tool-data/amrfinderplus-db/amrfinderplus_V3.12_2024-05-02.2', which is a bug (note it's the same path, joined with,)The underlying issue is that the data manager (DM) would add new rows to the output
.locfile every time it was invoked - including if new versions of the data manager was installed. This would result in identical rows in the.locfile.Then, AMRFinderPlus itself would query that database with
<filter type="static_value" value="3.12" column="db_version"/>, which could erroneously result in multiple values being selected.We fix this here in four steps:
db_versioncolumn to the DM output, which did not conform to the schema. This is a separate bug.FOR CONTRIBUTOR: