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

Index dcp13 in prod2 (#3843) #3867

Merged
merged 5 commits into from
Feb 16, 2022
Merged

Conversation

achave11-ucsc
Copy link
Member

@achave11-ucsc achave11-ucsc commented Feb 15, 2022

#3843

Author

  • PR title references issue
  • PR title matches issue title (preceded by Fix: for bugs) or there is a good reason why they're different
  • Title of main commit references issue
  • PR is connected to Zenhub issue and description links to issue

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 (freebies & chains)

  • Freebies are blocked on this PR or there are no freebies in this PR
  • Freebies are referenced in commit titles or there are no freebies in this PR
  • This PR is blocked by previous PR in the chain or this PR is not chained to another PR
  • Added chain label to the blocking 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
  • Added announcement to PR description or this PR does not require announcement
  • Added checklist items for additional operator tasks or this PR does not require additional tasks

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

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

Primary reviewer (after approval)

  • Commented in issue about demo expectations or labelled issue as no demo
  • Decided if PR can be labeled no sandbox
  • PR title is appropriate as title of merge commit
  • Moved ticket to Approved column
  • Assigned PR to an operator

Operator (before pushing merge the commit)

  • Checked reindex label and r commit title tag
  • Checked that demo expectations are clear or issue is labeled as no demo
  • Rebased and squashed branch
  • Sanity-checked history
  • Pushed PR branch to Github
  • Branch pushed to Gitlab and added sandbox label or PR is labeled no sandbox
  • Build passed in sandbox or PR is labeled no sandbox
  • 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
  • Added PR reference to merge commit title
  • Collected commit title tags in merge commit title
  • Moved linked issue to Merged column
  • Pushed merge commit to Github

Operator (after pushing the merge commit)

  • Made announcement requested by author or PR description does not contain an announcement
  • Moved freebies to Merged column or there are no freebies in this PR
  • Shortened the PR chain or this PR is not the base of another PR
  • Verified that N reviews labelling is accurate or this PR is authored by lead
  • Pushed merge commit to Gitlab or merge commit can be pushed later, with another PR
  • Deleted PR branch from Github and Gitlab
  • Build passes on Gitlab
  • Moved issues to prod or Merged prod or this PR does not represent a promotion

Operator (reindex)

  • Started reindex in target deployment or this PR does not require reindexing
  • Index dcp13 catalog only
  • Checked for and triaged indexing failures or this PR does not require reindexing
  • Emptied fail queues in target deployment or this PR does not require reindexing
  • Filed backport PR or this PR does not represent a hotfix

Operator

  • Run IT locally
  • Unassigned PR

@github-actions github-actions bot added the orange [process] Done by the Azul team label Feb 15, 2022
@codecov
Copy link

codecov bot commented Feb 15, 2022

Codecov Report

Merging #3867 (4e2037a) into develop (3f48630) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #3867   +/-   ##
========================================
  Coverage    81.70%   81.70%           
========================================
  Files          125      125           
  Lines        15050    15050           
========================================
  Hits         12297    12297           
  Misses        2753     2753           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3f48630...4e2037a. Read the comment docs.

@coveralls
Copy link

coveralls commented Feb 15, 2022

Coverage Status

Coverage remained the same at 81.924% when pulling 4e2037a on issues/achave11/3843-prod2-dcp13 into 3f48630 on develop.

@amarjandu amarjandu removed their assignment Feb 15, 2022
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11/3843-prod2-dcp13 branch 2 times, most recently from 5c9e3fb to 49232a1 Compare February 15, 2022 23:14
@achave11-ucsc achave11-ucsc requested review from hannes-ucsc and removed request for amarjandu February 15, 2022 23:17
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.

As agreed during demo, we'll deal with the duplication using a dictionary, in a separate PR. They way this is currently structured, it is very difficult to see which projects where updated. Please create three commits:

The first commit should rename dcp2_sources to dcp12_sources.

The second commit duplicates the dcp12 catalog and the dcp12_sources variable to dcp13 and dcp13_sources respectively.

The third commit adds the _dcp13 snapshots from the spreadsheet.

Also please make sure the list literals defining the sources are sorted by project UUID.

@hannes-ucsc hannes-ucsc removed their assignment Feb 16, 2022
@hannes-ucsc hannes-ucsc added the 1 review [process] Lead requested changes once label Feb 16, 2022
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.

Thanks for the quick turn around.

dcp1_sources wasn't sorted

remember to differentiate split commits in the message of the commit body

I'll fix the sorting and add the dictionary approach I mentioned in PL.

@hannes-ucsc hannes-ucsc added 2 reviews [process] Lead requested changes twice and removed 1 review [process] Lead requested changes once labels Feb 16, 2022
@hannes-ucsc hannes-ucsc force-pushed the issues/achave11/3843-prod2-dcp13 branch from 24f25a9 to f80207b Compare February 16, 2022 06:56
@hannes-ucsc hannes-ucsc added reindex:dev [process] PR requires reindexing dev no sandbox [process] PR will not be tested in the sandbox labels Feb 16, 2022
@hannes-ucsc hannes-ucsc self-requested a review February 16, 2022 17:56
Avoid duplicating unchanged snapshots
@hannes-ucsc hannes-ucsc force-pushed the issues/achave11/3843-prod2-dcp13 branch from f80207b to 4e2037a Compare February 16, 2022 18:27
@achave11-ucsc achave11-ucsc merged commit fbbd1a2 into develop Feb 16, 2022
@achave11-ucsc achave11-ucsc deleted the issues/achave11/3843-prod2-dcp13 branch February 16, 2022 21:03
@achave11-ucsc achave11-ucsc removed their assignment Feb 26, 2022
@achave11-ucsc
Copy link
Member Author

IT passed with the exception of two manifest request which failed because of TDR slowness HumanCellAtlas/dcp2#57

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 no sandbox [process] PR will not be tested in the sandbox orange [process] Done by the Azul team reindex:dev [process] PR requires reindexing dev
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants