Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: AnVIL indexer doesn't follow downstream links from files to files (#4761) #4765

Merged

Conversation

nadove-ucsc
Copy link
Contributor

@nadove-ucsc nadove-ucsc commented Nov 23, 2022

Connected issues: #4761

Checklist

Author

  • Target branch is develop
  • Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
  • PR title references all connected issues
  • PR title matches1 that of a connected issue or comment in PR explains why they're different
  • For each connected issue, there is at least one commit whose title references that issue
  • PR is connected to all connected issues via Zenhub
  • PR description links to connected issues
  • Added partial label to PR or this PR completely resolves all connected issues

1 when the issue title describes a problem, the corresponding PR title is Fix: followed by the issue title

Author (reindex)

  • Added r tag to commit title or this PR does not require reindexing
  • Added reindex label to PR or this PR does not require reindexing

Author (chains)

  • This PR is blocked by previous PR in the chain or this PR is not chained to another PR
  • Added base label to the blocking PR or this PR is not chained to another PR
  • Added chained label to this PR or this PR is not chained to another PR

Author (upgrading)

  • Documented upgrading of deployments in UPGRADING.rst or this PR does not require upgrading
  • Added u tag to commit title or this PR does not require upgrading
  • Added upgrade label to PR or this PR does not require upgrading

Author (operator tasks)

  • Added checklist items for additional operator tasks or this PR does not require additional tasks

Author (hotfixes)

  • Added F tag to main commit title or this PR does not include permanent fix for a temporary hotfix
  • Reverted the temporary hotfixes for any connected issues or the prod branch has no temporary hotfixes for any connected issues

Author (requirements, before every review)

  • Ran make requirements_update or this PR does not touch requirements*.txt, common.mk, Makefile and Dockerfile
  • Added R tag to commit title or this PR does not touch requirements*.txt
  • Added reqs label to PR or this PR does not touch requirements*.txt

Author (rebasing, integration test)

  • make integration_test passes in personal deployment or this PR does not touch functionality that could break the IT
  • Rebased PR branch on develop, squashed old fixups

Peer reviewer (after requesting changes)

Uncheck the Author (requirements) and Author (rebasing, integration test)
checklists.

Peer reviewer (after approval)

  • Ticket is in Review requested column
  • Requested review from primary reviewer
  • Assigned PR to primary reviewer

Primary reviewer (after requesting changes)

Uncheck the Author (requirements) and Author (rebasing, integration test)
checklists. Update the N reviews label.

Primary reviewer (after approval)

  • Actually approved the PR
  • Labeled connected issues as demo or no demo
  • Commented on connected issues about demo expectations or all connected issues are labeled no demo
  • Decided if PR can be labeled no sandbox
  • PR title is appropriate as title of merge commit
  • N reviews label is accurate
  • Moved ticket to Approved column
  • Assigned PR to current operator

Operator (before pushing merge the commit)

  • Checked reindex label and r commit title tag
  • Checked that demo expectations are clear or all connected issues are labeled no demo
  • Rebased and squashed PR branch
  • Sanity-checked history
  • Pushed PR branch to GitHub
  • Pushed PR branch to GitLab dev and added sandbox label or PR is labeled no sandbox
  • Build passes in sandbox deployment or PR is labeled no sandbox
  • Reviewed build log for anomalies in sandbox deployment or PR is labeled no sandbox
  • Deleted unreferenced indices in sandbox or this PR does not remove catalogs or otherwise causes unreferenced indices
  • Started reindex in sandbox or this PR does not require reindexing sandbox
  • Checked for failures in sandbox or this PR does not require reindexing sandbox
  • Pushed PR branch to GitLab anvildev or PR is labeled no sandbox
  • Build passes in anvilbox deployment or PR is labeled no sandbox
  • Reviewed build log for anomalies in anvilbox deployment or PR is labeled no sandbox
  • Deleted unreferenced indices in anvilbox or this PR does not remove catalogs or otherwise causes unreferenced indices
  • Started reindex in anvilbox or this PR does not require reindexing sandbox
  • Checked for failures in anvilbox or this PR does not require reindexing sandbox
  • Added PR reference to merge commit title
  • Collected commit title tags in merge commit title
  • Moved connected issues to Merged column
  • Pushed merge commit to GitHub

Operator (after pushing the merge commit)

  • Shortened the PR chain or this PR is not labeled base
  • Pushed merge commit to GitLab dev or PR is labeled no sandbox
  • Pushed merge commit to GitLab anvildev or PR is labeled no sandbox
  • Build passes on GitLab dev1
  • Reviewed build log for anomalies on GitLab dev1
  • Build passes on GitLab anvildev1
  • Reviewed build log for anomalies on GitLab anvildev1
  • Deleted PR branch from GitHub
  • Deleted PR branch from GitLab dev
  • Deleted PR branch from GitLab anvildev

1 When pushing the merge commit is skipped due to the PR being
labelled no sandbox, the next build triggered by a PR whose merge commit is
pushed determines this checklist item.

Operator (reindex)

  • Deleted unreferenced indices in dev or this PR does not remove catalogs or otherwise causes unreferenced indices
  • Deleted unreferenced indices in anvildev or this PR does not remove catalogs or otherwise causes unreferenced indices
  • Started reindex in dev or this PR does not require reindexing
  • Started reindex in anvildev or this PR does not require reindexing
  • Checked for and triaged indexing failures in dev or this PR does not require reindexing
  • Checked for and triaged indexing failures in anvildev or this PR does not require reindexing
  • Emptied fail queues in dev deployment or this PR does not require reindexing
  • Emptied fail queues in anvildev deployment or this PR does not require reindexing

Operator

  • Unassigned PR

Shorthand for review comments

  • L line is too long
  • W line wrapping is wrong
  • Q bad quotes
  • F other formatting problem

@nadove-ucsc nadove-ucsc added base [process] Another PR needs to be rebased before merging this one reindex:dev [process] PR requires reindexing dev labels Nov 23, 2022
@github-actions github-actions bot added the orange [process] Done by the Azul team label Nov 23, 2022
@nadove-ucsc nadove-ucsc force-pushed the issues/noah-aviel-dove/4761-anvil-broken-file-links branch from d7b4f27 to 04bf2d5 Compare November 23, 2022 21:57
@coveralls
Copy link

coveralls commented Nov 23, 2022

Coverage Status

Coverage remained the same at 84.514% when pulling 68777aa on issues/noah-aviel-dove/4761-anvil-broken-file-links into 55336ab on develop.

@codecov
Copy link

codecov bot commented Nov 23, 2022

Codecov Report

Merging #4765 (b4fdf1b) into develop (55336ab) will increase coverage by 0.01%.
The diff coverage is 0.00%.

❗ Current head b4fdf1b differs from pull request most recent head 68777aa. Consider uploading reports for the commit 68777aa to get more accurate results

@@             Coverage Diff             @@
##           develop    #4765      +/-   ##
===========================================
+ Coverage    84.02%   84.04%   +0.01%     
===========================================
  Files          140      140              
  Lines        16938    16932       -6     
===========================================
- Hits         14233    14231       -2     
+ Misses        2705     2701       -4     
Impacted Files Coverage Δ
src/azul/plugins/metadata/anvil/__init__.py 77.35% <ø> (ø)
...c/azul/plugins/metadata/anvil/indexer/transform.py 99.44% <ø> (ø)
...rc/azul/plugins/metadata/anvil/service/response.py 38.33% <ø> (ø)
src/azul/plugins/repository/tdr_anvil/__init__.py 32.81% <0.00%> (ø)
src/azul/terraform.py 74.81% <0.00%> (+1.76%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

dsotirho-ucsc
dsotirho-ucsc previously approved these changes Nov 24, 2022
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

src/azul/plugins/repository/tdr_anvil/__init__.py Outdated Show resolved Hide resolved
Comment on lines 410 to 411
ala.alignmentactivity_id,
'alignmentactivity',
ala.alignmentactivity_id AS activity_id,
'alignmentactivity' AS activity_table,
Copy link
Member

@hannes-ucsc hannes-ucsc Nov 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be an unrelated change, maybe a fix for a bug that was shadowed by #4761? If so, that should go into a separate commit.

activity=KeyReference(key=row['actvity_id'], entity_type=row['activity_table']))
activity=KeyReference(key=row['activity_id'], entity_type=row['activity_table']))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here?

@hannes-ucsc hannes-ucsc added the 1 review [process] Lead requested changes once label Nov 28, 2022
@hannes-ucsc hannes-ucsc removed their assignment Nov 28, 2022
@nadove-ucsc nadove-ucsc force-pushed the issues/noah-aviel-dove/4761-anvil-broken-file-links branch 2 times, most recently from 1025d91 to 35d3b27 Compare November 29, 2022 05:11
@dsotirho-ucsc dsotirho-ucsc force-pushed the issues/noah-aviel-dove/4761-anvil-broken-file-links branch from b4fdf1b to 68777aa Compare November 30, 2022 23:53
@dsotirho-ucsc dsotirho-ucsc added the sandbox [process] Resolution is being verified in sandbox deployment label Nov 30, 2022
@dsotirho-ucsc dsotirho-ucsc merged commit 68c0e09 into develop Dec 1, 2022
@dsotirho-ucsc dsotirho-ucsc removed the base [process] Another PR needs to be rebased before merging this one label Dec 1, 2022
@dsotirho-ucsc dsotirho-ucsc removed their assignment Dec 1, 2022
@hannes-ucsc
Copy link
Member

@danielsotirhos, when you are operator, you must not unassign yourself with open checklist items.

@dsotirho-ucsc
Copy link
Contributor

I previously failed to mark the checkbox Build passes on GitLab anvildev for the merge commit.
Marking the checkbox now, proof of build passing is here: https://gitlab.anvil.gi.ucsc.edu/ucsc/azul/-/pipelines/2498

@achave11-ucsc achave11-ucsc deleted the issues/noah-aviel-dove/4761-anvil-broken-file-links branch December 5, 2022 22:52
@achave11-ucsc achave11-ucsc removed their assignment Dec 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1 review [process] Lead requested changes once orange [process] Done by the Azul team reindex:dev [process] PR requires reindexing dev sandbox [process] Resolution is being verified in sandbox deployment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants