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: Transient IT test_snapshot_listing fails in anvilbox (#5096) #6919

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

achave11-ucsc
Copy link
Member

@achave11-ucsc achave11-ucsc commented Feb 20, 2025

Connected issues: #5096

Checklist

Author

  • PR is a draft
  • Target branch is develop
  • Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
  • On ZenHub, PR is connected to all issues it (partially) resolves
  • PR description links to connected issues
  • PR title matches1 that of a connected issue or comment in PR explains why they're different
  • PR title references all connected issues
  • For each connected issue, there is at least one commit whose title references that issue

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

Author (partiality)

  • Added p tag to titles of partial commits
  • This PR is labeled partial or completely resolves all connected issues
  • This PR partially resolves each of the connected issues or does not have the partial label

Author (chains)

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

Author (reindex, API changes)

  • Added r tag to commit title or the changes introduced by this PR will not require reindexing of any deployment
  • This PR is labeled reindex:dev or the changes introduced by it will not require reindexing of dev
  • This PR is labeled reindex:anvildev or the changes introduced by it will not require reindexing of anvildev
  • This PR is labeled reindex:anvilprod or the changes introduced by it will not require reindexing of anvilprod
  • This PR is labeled reindex:prod or the changes introduced by it will not require reindexing of prod
  • This PR is labeled reindex:partial and its description documents the specific reindexing procedure for dev, anvildev, anvilprod and prod or requires a full reindex or carries none of the labels reindex:dev, reindex:anvildev, reindex:anvilprod and reindex:prod
  • This PR and its connected issues are labeled API or this PR does not modify a REST API
  • Added a (A) tag to commit title for backwards (in)compatible changes or this PR does not modify a REST API
  • Updated REST API version number in app.py or this PR does not modify a REST API

Author (upgrading deployments)

  • Ran make docker_images.json and committed the resulting changes or this PR does not modify azul_docker_images, or any other variables referenced in the definition of that variable
  • Documented upgrading of deployments in UPGRADING.rst or this PR does not require upgrading deployments
  • Added u tag to commit title or this PR does not require upgrading deployments
  • This PR is labeled upgrade or does not require upgrading deployments
  • This PR is labeled deploy:shared or does not modify docker_images.json, and does not require deploying the shared component for any other reason
  • This PR is labeled deploy:gitlab or does not require deploying the gitlab component
  • This PR is labeled deploy:runner or does not require deploying the runner image

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 none of the stable branches (anvilprod and prod) have temporary hotfixes for any of the issues connected to this PR

Author (before every review)

  • Rebased PR branch on develop, squashed old fixups
  • Ran make requirements_update or this PR does not modify requirements*.txt, common.mk, Makefile and Dockerfile
  • Added R tag to commit title or this PR does not modify requirements*.txt
  • This PR is labeled reqs or does not modify requirements*.txt
  • make integration_test passes in personal deployment or this PR does not modify functionality that could affect the IT outcome

Peer reviewer (after approval)

  • PR is not a draft
  • Ticket is in Review requested column
  • PR is awaiting requested review from system administrator
  • PR is assigned to only the system administrator

System administrator (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
  • A comment to this PR details the completed security design review
  • PR title is appropriate as title of merge commit
  • N reviews label is accurate
  • Moved connected issues to Approved column
  • PR is assigned to only the operator

Operator (before pushing merge the commit)

  • Checked reindex:… labels and r commit title tag
  • Checked that demo expectations are clear or all connected issues are labeled no demo
  • Squashed PR branch and rebased onto develop
  • Sanity-checked history
  • Pushed PR branch to GitHub
  • Ran _select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Ran _select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Checked the items in the next section or this PR is labeled deploy:gitlab
  • PR is assigned to only the system administrator or this PR is not labeled deploy:gitlab

System administrator

  • Background migrations for dev.gitlab are complete or this PR is not labeled deploy:gitlab
  • Background migrations for anvildev.gitlab are complete or this PR is not labeled deploy:gitlab
  • PR is assigned to only the operator

Operator (before pushing merge the commit)

  • Ran _select dev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • Ran _select anvildev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • Added sandbox label or PR is labeled no sandbox
  • Pushed PR branch to GitLab dev 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 in dev
  • Deleted unreferenced indices in anvilbox or this PR does not remove catalogs or otherwise causes unreferenced indices in anvildev
  • Started reindex in sandbox or this PR is not labeled reindex:dev
  • Started reindex in anvilbox or this PR is not labeled reindex:anvildev
  • Checked for failures in sandbox or this PR is not labeled reindex:dev
  • Checked for failures in anvilbox or this PR is not labeled reindex:anvildev
  • The title of the merge commit starts with the title of this PR
  • Added PR # reference to merge commit title
  • Collected commit title tags in merge commit title but only included p if the PR is also labeled partial
  • Moved connected issues to Merged lower column in ZenHub
  • Moved blocked issues to Triage or no issues are blocked on the connected issues
  • 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
  • Pushed merge commit to GitLab anvildev
  • Build passes on GitLab dev
  • Reviewed build logs for anomalies on GitLab dev
  • Build passes on GitLab anvildev
  • Reviewed build logs for anomalies on GitLab anvildev
  • Ran _select dev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Ran _select anvildev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Deleted PR branch from GitHub
  • Deleted PR branch from GitLab dev
  • Deleted PR branch from GitLab anvildev

Operator (reindex)

  • Deindexed all unreferenced catalogs in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed all unreferenced catalogs in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Deindexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Indexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Indexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Started reindex in dev or this PR does not require reindexing dev
  • Started reindex in anvildev or this PR does not require reindexing anvildev
  • Checked for, triaged and possibly requeued messages in both fail queues in dev or this PR does not require reindexing dev
  • Checked for, triaged and possibly requeued messages in both fail queues in anvildev or this PR does not require reindexing anvildev
  • Emptied fail queues in dev or this PR does not require reindexing dev
  • Emptied fail queues in anvildev or this PR does not require reindexing anvildev
  • Restarted the Data Browser pipeline for the ucsc/hca/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted the Data Browser pipeline for the ucsc/lungmap/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in dev or this PR does not require reindexing dev
  • Restarted the Data Browser pipeline for the ucsc/anvil/anvildev branch on GitLab in anvildev or this PR does not require reindexing anvildev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in anvildev or this PR does not require reindexing anvildev

Operator

  • Propagated the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels to the next promotion PRs or this PR carries none of these labels
  • Propagated any specific instructions related to the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labels
  • PR is assigned to no one

Shorthand for review comments

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

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

codecov bot commented Feb 20, 2025

Codecov Report

Attention: Patch coverage is 0% with 9 lines in your changes missing coverage. Please review.

Project coverage is 85.66%. Comparing base (272cf3b) to head (200a979).

Files with missing lines Patch % Lines
test/integration_test.py 0.00% 9 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #6919      +/-   ##
===========================================
- Coverage    85.68%   85.66%   -0.02%     
===========================================
  Files          148      148              
  Lines        21562    21566       +4     
===========================================
  Hits         18475    18475              
- Misses        3087     3091       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@coveralls
Copy link

coveralls commented Feb 20, 2025

Coverage Status

coverage: 85.696% (-0.004%) from 85.7%
when pulling 200a979 on issues/achave11-ucsc/5096-fix-it
into 272cf3b on develop.

@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/5096-fix-it branch 6 times, most recently from d651b26 to 0efb3eb Compare February 21, 2025 19:09
paged_snapshots = self._public_tdr_client.snapshot_names_by_id()
snapshots = self._public_tdr_client.snapshot_names_by_id()
self.assertEqual(snapshots, paged_snapshots)
deployment_specific_prefix_filter = {
Copy link
Contributor

Choose a reason for hiding this comment

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

It is a substring filter, not a prefix filter.

Suggested change
deployment_specific_prefix_filter = {
# Without a filter, the test takes so long that there's a real risk of
# failure due to new snapshots being added mid-test
snapshot_filters_by_deployment = {

Comment on lines 389 to 390
Test with minimal page sizes (1, 2) and a subset of deployment-specific
snapshots (obtain via a filtered request). To make sure paging works.
Copy link
Contributor

Choose a reason for hiding this comment

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

Too much detail IMO. I moved the 2nd half to an inline comment.

Suggested change
Test with minimal page sizes (1, 2) and a subset of deployment-specific
snapshots (obtain via a filtered request). To make sure paging works.
Test with small page sizes to make sure paging works.

@nadove-ucsc nadove-ucsc removed their assignment Feb 24, 2025
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/5096-fix-it branch from 0efb3eb to e812d4b Compare February 25, 2025 03:11
nadove-ucsc
nadove-ucsc previously approved these changes Feb 25, 2025
@nadove-ucsc nadove-ucsc marked this pull request as ready for review February 25, 2025 09:28
@hannes-ucsc hannes-ucsc added the 0 reviews [process] Lead didn't request any changes label Feb 25, 2025
@hannes-ucsc hannes-ucsc removed their assignment Feb 25, 2025
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/5096-fix-it branch 2 times, most recently from 6cb51b3 to ef62937 Compare February 26, 2025 22:46
@hannes-ucsc hannes-ucsc removed their assignment Feb 27, 2025
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/5096-fix-it branch 2 times, most recently from 56c0316 to 0184141 Compare February 27, 2025 20:50
hannes-ucsc
hannes-ucsc previously approved these changes Feb 28, 2025
@hannes-ucsc
Copy link
Member

Security design review

  • Security design review completed; this PR does not
    • … affect authentication; for example:
      • OAuth 2.0 with the application (API or Swagger UI)
      • Authentication of developers with Google Cloud APIs
      • Authentication of developers with AWS APIs
      • Authentication with a GitLab instance in the system
      • Password and 2FA authentication with GitHub
      • API access token authentication with GitHub
      • Authentication with Terra
    • … affect the permissions of internal users like access to
      • Cloud resources on AWS and GCP
      • GitLab repositories, projects and groups, administration
      • an EC2 instance via SSH
      • GitHub issues, pull requests, commits, commit statuses, wikis, repositories, organizations
    • … affect the permissions of external users like access to
      • TDR snapshots
    • … affect permissions of service or bot accounts
      • Cloud resources on AWS and GCP
    • … affect audit logging in the system, like
      • adding, removing or changing a log message that represents an auditable event
      • changing the routing of log messages through the system
    • … affect monitoring of the system
    • … introduce a new software dependency like
      • Python packages on PYPI
      • Command-line utilities
      • Docker images
      • Terraform providers
    • … add an interface that exposes sensitive or confidential data at the security boundary
    • … affect the encryption of data at rest
    • … require persistence of sensitive or confidential data that might require encryption at rest
    • … require unencrypted transmission of data within the security boundary
    • … affect the network security layer; for example by
      • modifying, adding or removing firewall rules
      • modifying, adding or removing security groups
      • changing or adding a port a service, proxy or load balancer listens on
  • Documentation on any unchecked boxes is provided in comments below

@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/5096-fix-it branch 2 times, most recently from 6fb1b84 to 3624370 Compare March 4, 2025 04:24
@achave11-ucsc achave11-ucsc added the sandbox [process] Resolution is being verified in sandbox deployment label Mar 4, 2025
@achave11-ucsc
Copy link
Member Author

achave11-ucsc commented Mar 4, 2025

Previous code owner approval is now ineffective. Assigned active code owner for re-approval.

with self.subTest(page_size=page_size):
with mock.patch.object(TDRClient, 'page_size', page_size):
paged_snapshots = self._public_tdr_client.snapshot_names_by_id()
self.assertGreater(1, self._public_tdr_client.page_size)
Copy link
Contributor

Choose a reason for hiding this comment

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

The test does not pass when I check out this commit. We just patched the page size to be 1, so it makes no sense to assert that it's greater than 1:

2025-03-03 20:53:55,622    INFO MainThread test.integration_test: Failed sub-test [None] {'page_size': 1}
SubTest failure: Traceback (most recent call last):
  File "/home/nadove/.pyenv/versions/3.12.9/lib/python3.12/unittest/case.py", line 58, in testPartExecutor
    yield
  File "/home/nadove/.pyenv/versions/3.12.9/lib/python3.12/unittest/case.py", line 539, in subTest
    yield
  File "/home/nadove/PycharmProjects/azul-sc/test/integration_test.py", line 363, in subTest
    yield
  File "/home/nadove/PycharmProjects/azul-sc/test/integration_test.py", line 395, in test_snapshot_listing
    self.assertGreater(1, self._public_tdr_client.page_size)
AssertionError: 1 not greater than 1

Copy link
Contributor

Choose a reason for hiding this comment

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

I think @hannes-ucsc's feedback

I also think we should assert the number of pages to be greater than 1

has not been implemented here. I think this code erroneously asserts that the page size is > 1 instead of asserting that the page count is > 1.

Copy link
Contributor

Choose a reason for hiding this comment

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

To that end:

Subject: [PATCH] REVIEW
---
Index: test/integration_test.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/test/integration_test.py b/test/integration_test.py
--- a/test/integration_test.py	(revision b829c3bc23a76f05f0a123bb5e0771d3f42af607)
+++ b/test/integration_test.py	(date 1741064353322)
@@ -392,7 +392,7 @@
             with self.subTest(page_size=page_size):
                 with mock.patch.object(TDRClient, 'page_size', page_size):
                     paged_snapshots = self._public_tdr_client.snapshot_names_by_id()
-                    self.assertGreater(1, self._public_tdr_client.page_size)
+                    self.assertGreater(len(paged_snapshots), page_size)
                 snapshots = self._public_tdr_client.snapshot_names_by_id()
                 self.assertEqual(snapshots, paged_snapshots)

We can't directly observe the page count from outside the method, but this assertion proves that multiple pages were fetched via the pigeonhole principle.

Comment on lines 404 to 406
self.assertGreater(len(paged_snapshots), 0)
snapshots = self._tdr_client.snapshot_names_by_id(filter=filter)
self.assertLess(len(snapshots), 20)
Copy link
Contributor

@nadove-ucsc nadove-ucsc Mar 4, 2025

Choose a reason for hiding this comment

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

Since we assert that the lists are equal, it's a bit confusing to make separate assertions about their sizes. I believe this simplifies to:

Suggested change
self.assertGreater(len(paged_snapshots), 0)
snapshots = self._tdr_client.snapshot_names_by_id(filter=filter)
self.assertLess(len(snapshots), 20)
snapshots = self._tdr_client.snapshot_names_by_id(filter=filter)
self.assertIn(len(snapshots), range(1, 20))

@nadove-ucsc nadove-ucsc removed their assignment Mar 4, 2025
@achave11-ucsc achave11-ucsc added the hold warm [process] PR can't land just yet but needs to be rebased daily label Mar 4, 2025
with mock.patch.object(TDRClient, 'page_size', page_size):
paged_snapshots = self._tdr_client.snapshot_names_by_id(filter=filter)
snapshots = self._tdr_client.snapshot_names_by_id(filter=filter)
self.assertIn(len(snapshots), range(1, 20))
Copy link
Contributor

Choose a reason for hiding this comment

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

Changed my mind about using range for this check, because I think the lower bound should be higher:

Suggested change
self.assertIn(len(snapshots), range(1, 20))
self.assertLess(len(snapshots), 20)
# This proves that multiple pages were fetched via the pigeonhole principle
self.assertGreater(len(snapshots), page_size)

@nadove-ucsc nadove-ucsc removed their assignment Mar 8, 2025
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 hold warm [process] PR can't land just yet but needs to be rebased daily orange [process] Done by the Azul team sandbox [process] Resolution is being verified in sandbox deployment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants