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

Replace snapshot and remove workaround (#5229) #5313

Merged
merged 1 commit into from
Jun 21, 2023

Conversation

nadove-ucsc
Copy link
Contributor

@nadove-ucsc nadove-ucsc commented Jun 13, 2023

Connected issues: #5229

Followup PR to remove the initial workaround

Checklist

Author

  • PR is a draft
  • 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, API changes)

  • 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
  • Added a (compatible changes) or A (incompatible ones) tag to commit title or this PR does not modify the Azul service API
  • Added API label to connected issues or this PR does not modify the Azul service API

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 (before every review)

  • Rebased PR branch on develop, squashed old fixups
  • 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
  • make integration_test passes in personal deployment or this PR does not touch functionality that could break the IT

Peer reviewer (after requesting changes)

Uncheck the Author (before every review) checklists.

Peer reviewer (after approval)

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

Primary reviewer (after requesting changes)

Uncheck the before every review 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
  • PR has checklist items for upgrading instructions or PR is not labeled upgrade
  • Squashed PR branch and rebased onto develop
  • Sanity-checked history
  • Pushed PR branch to GitHub
  • Pushed PR branch to GitLab dev and added sandbox label or PR is labeled no sandbox
  • Pushed PR branch to GitLab anvildev or PR is labeled no sandbox
  • Build passes in sandbox deployment or PR is labeled no sandbox
  • Build passes in anvilbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in sandbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in anvilbox deployment or PR is labeled no sandbox
  • Deleted unreferenced indices in sandbox or this PR does not remove catalogs or otherwise causes unreferenced indices
  • Deleted unreferenced indices in anvilbox or this PR does not remove catalogs or otherwise causes unreferenced indices
  • Started reindex in sandbox this PR does not require reindexing sandbox
  • Started reindex in anvilbox this PR does not require reindexing anvilbox
  • Checked for failures in sandbox this PR does not require reindexing sandbox
  • Checked for failures in anvilbox this PR does not require reindexing anvilbox
  • Title of merge commit starts with title from this PR
  • Added PR reference to merge commit title
  • Added commit title tags to merge commit title
  • Moved connected issues to Merged column in ZenHub
  • Pushed merge commit to GitHub

Operator (chain shortening)

  • Changed the target branch of the blocked PR to develop or this PR is not labeled base
  • Removed the chained label from the blocked PR or this PR is not labeled base
  • Removed the blocking relationship from the blocked PR or this PR is not labeled base
  • Removed the base label from this PR or this PR is not labeled base

Operator (after pushing the merge commit)

  • Pushed merge commit to GitLab dev or PR is labeled no sandbox
  • Pushed merge commit to GitLab anvildev or PR is labeled no sandbox
  • Pushed merge commit to GitLab anvilprod or PR is labeled no sandbox
  • Build passes on GitLab dev1
  • Reviewed build logs for anomalies on GitLab dev1
  • Build passes on GitLab anvildev1
  • Reviewed build logs for anomalies on GitLab anvildev1
  • Build passes on GitLab anvilprod1
  • Reviewed build logs for anomalies on GitLab anvilprod1
  • Deleted PR branch from GitHub
  • Deleted PR branch from GitLab dev
  • Deleted PR branch from GitLab anvildev
  • Deleted PR branch from GitLab anvilprod

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
  • Deleted unreferenced indices in anvilprod or this PR does not remove catalogs or otherwise causes unreferenced indices
  • Started reindex in dev this PR does not require reindexing dev
  • Started reindex in anvildev this PR does not require reindexing anvildev
  • Started reindex in anvilprod
  • Checked for and triaged indexing failures in dev this PR does not require reindexing dev
  • Checked for and triaged indexing failures in anvildev this PR does not require reindexing anvildev
  • Checked for and triaged indexing failures in anvilprod
  • Emptied fail queues in dev deployment this PR does not require reindexing dev
  • Emptied fail queues in anvildev deployment this PR does not require reindexing anvildev
  • Emptied fail queues in anvilprod deployment

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 the reindex:dev [process] PR requires reindexing dev label Jun 13, 2023
@github-actions github-actions bot added the orange [process] Done by the Azul team label Jun 13, 2023
@nadove-ucsc
Copy link
Contributor Author

Operator: only anvilprod needs a https://github.com/DataBiosphere/azul/labels/reindex for this PR

@coveralls
Copy link

coveralls commented Jun 13, 2023

Coverage Status

coverage: 83.872% (-0.005%) from 83.877% when pulling efdec9f on issues/nadove-ucsc/5229-update-snapshot into 37bcbc2 on develop.

@codecov
Copy link

codecov bot commented Jun 13, 2023

Codecov Report

Merging #5313 (efdec9f) into develop (37bcbc2) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff             @@
##           develop    #5313      +/-   ##
===========================================
- Coverage    83.85%   83.85%   -0.01%     
===========================================
  Files          152      152              
  Lines        18539    18540       +1     
===========================================
  Hits         15546    15546              
- Misses        2993     2994       +1     
Impacted Files Coverage Δ
test/integration_test.py 0.00% <0.00%> (ø)

achave11-ucsc
achave11-ucsc previously approved these changes Jun 14, 2023
@achave11-ucsc achave11-ucsc removed their assignment Jun 14, 2023
@achave11-ucsc achave11-ucsc marked this pull request as ready for review June 14, 2023 16:40
# false positives in the current snapshots
# (https://github.com/DataBiosphere/azul/issues/5229)
is_supplementary = one(set.union(*(
set(always_iterable(file['is_supplementary']))
Copy link
Member

Choose a reason for hiding this comment

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

Why are the inner sets needed? Wouldn't set(chain.from_iterable(… be a better choice here?

Copy link
Member

@hannes-ucsc hannes-ucsc left a comment

Choose a reason for hiding this comment

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

This comment is easy to miss. It would be better to roll it into the checklist.

@hannes-ucsc hannes-ucsc added the 1 review [process] Lead requested changes once label Jun 15, 2023
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/5229-update-snapshot branch from 014fc17 to 36db500 Compare June 15, 2023 23:36
@nadove-ucsc
Copy link
Contributor Author

Second fixup addresses a failure that occurred with a primary bundle that lacked any files.

Copy link
Member

@hannes-ucsc hannes-ucsc left a comment

Choose a reason for hiding this comment

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

Considering this and this, I think we may need to slow down a bit and prioritize the stability of our main deployments and the reliability of our tests.

test/integration_test.py Outdated Show resolved Hide resolved
@hannes-ucsc hannes-ucsc added 2 reviews [process] Lead requested changes twice and removed 1 review [process] Lead requested changes once labels Jun 16, 2023
@hannes-ucsc hannes-ucsc removed their assignment Jun 16, 2023
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/5229-update-snapshot branch from e6edf7f to 8afa8c5 Compare June 16, 2023 01:53
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/5229-update-snapshot branch 2 times, most recently from 965a71c to 61334da Compare June 20, 2023 22:00
@nadove-ucsc nadove-ucsc requested a review from hannes-ucsc June 20, 2023 22:28
@hannes-ucsc hannes-ucsc force-pushed the issues/nadove-ucsc/5229-update-snapshot branch from 61334da to 0229c61 Compare June 21, 2023 02:47
@achave11-ucsc achave11-ucsc force-pushed the issues/nadove-ucsc/5229-update-snapshot branch from 0229c61 to efdec9f Compare June 21, 2023 15:24
@achave11-ucsc achave11-ucsc added the sandbox [process] Resolution is being verified in sandbox deployment label Jun 21, 2023
@achave11-ucsc achave11-ucsc merged commit f1330a3 into develop Jun 21, 2023
@achave11-ucsc achave11-ucsc deleted the issues/nadove-ucsc/5229-update-snapshot branch June 21, 2023 21:56
@achave11-ucsc achave11-ucsc removed their assignment Jun 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2 reviews [process] Lead requested changes twice 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.

4 participants