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: Rebooting GitLab may trigger ClamAV alarm (#6114) #6763

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

Conversation

dsotirho-ucsc
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc commented Dec 13, 2024

Connected issues: #6114

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

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 Dec 13, 2024
@coveralls
Copy link

coveralls commented Dec 13, 2024

Coverage Status

coverage: 85.641%. remained the same
when pulling 216317f on issues/dsotirho-ucsc/6114-prune
into 34d7ce4 on develop.

Copy link

codecov bot commented Dec 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.62%. Comparing base (34d7ce4) to head (216317f).

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #6763   +/-   ##
========================================
  Coverage    85.62%   85.62%           
========================================
  Files          149      149           
  Lines        20945    20945           
========================================
  Hits         17934    17934           
  Misses        3011     3011           

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

@dsotirho-ucsc
Copy link
Contributor Author

6763_IT_2024-12-16.txt

Copy link
Contributor

@nadove-ucsc nadove-ucsc left a comment

Choose a reason for hiding this comment

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

First commit title doesn't read well. I suggest "Refactor Docker prune commands"

@@ -1936,20 +1936,20 @@ def merge(sets: Iterable[Iterable[str]]) -> Iterable[str]:
)
for command in [
sq(
# docker volume prune --force --all
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment doesn't seem useful.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, that was notes-to-self unintentionally left in.

terraform/gitlab/gitlab.tf.json.template.py Outdated Show resolved Hide resolved
@nadove-ucsc nadove-ucsc removed their assignment Dec 16, 2024
@dsotirho-ucsc dsotirho-ucsc force-pushed the issues/dsotirho-ucsc/6114-prune branch from c29648c to 7f0a6c3 Compare December 16, 2024 22:36
@dsotirho-ucsc
Copy link
Contributor Author

6763_IT_2024-12-16.txt

nadove-ucsc
nadove-ucsc previously approved these changes Dec 16, 2024
@nadove-ucsc nadove-ucsc marked this pull request as ready for review December 16, 2024 23:31
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.

How was this tested?

@hannes-ucsc hannes-ucsc removed their assignment Dec 17, 2024
@dsotirho-ucsc
Copy link
Contributor Author

How was this tested?

The refactor was tested by diffing the generated gitlab.tf.json before and after the commit.
The modified Docker commands were taken verbatim from the ticket and not tested.

@dsotirho-ucsc dsotirho-ucsc force-pushed the issues/dsotirho-ucsc/6114-prune branch from 7f0a6c3 to 8246db1 Compare December 21, 2024 00:09
@hannes-ucsc
Copy link
Member

How was this tested?

The refactor was tested by diffing the generated gitlab.tf.json before and after the commit. The modified Docker commands were taken verbatim from the ticket and not tested.

In other words, it wasn't tested. Looking at diffs does not constitute a test, by this team's standards. It is the PR author's responsibility to test their changes. The fact that a command was given in the issue does not absolve the author of that responsibility.

@hannes-ucsc hannes-ucsc added the 1 review [process] Lead requested changes once label Dec 31, 2024
@dsotirho-ucsc
Copy link
Contributor Author

Test on tempdev of the modified prune-images service:


## Check command lines executed by prune-images service

[ec2-user@ip-172-25-0-222 ~]$ sudo grep ExecStart /etc/systemd/system/prune-images.service
ExecStartPre=-/usr/bin/docker stop prune-images
ExecStartPre=-/usr/bin/docker rm prune-images
ExecStartPre=/usr/bin/docker pull 654654270592.dkr.ecr.us-east-1.amazonaws.com/docker.io/library/docker@sha256:e0733e0529749cec359cacf2d698214338f50dfb795a4673204504016e27d1dc
ExecStart=/usr/bin/docker exec gitlab-dind sh -c 'docker volume prune --force --all > /proc/1/fd/1'
ExecStart=/usr/bin/docker exec gitlab-dind sh -c 'docker system prune --force --all --filter "until=2160h" > /proc/1/fd/1'


## Check Docker volumes, images, & containers before starting service

[ec2-user@ip-172-25-0-222 ~]$ sudo docker volume ls
DRIVER    VOLUME NAME
local     b1548a9d710b9b47b4c62de8a71e5ff2ad76fdd3e17375990be974b33e915240

[ec2-user@ip-172-25-0-222 ~]$ sudo docker system df
TYPE            TOTAL     ACTIVE    SIZE      RECLAIMABLE
Images          3         3         4.714GB   0B (0%)
Containers      3         1         759B      0B (0%)
Local Volumes   1         1         0B        0B
Build Cache     0         0         0B        0B


## Check status of prune-images service before starting service

[ec2-user@ip-172-25-0-222 ~]$ sudo systemctl status prune-images
● prune-images.service - Pruning of stale docker images
   Loaded: loaded (/etc/systemd/system/prune-images.service; static; vendor preset: disabled)
   Active: inactive (dead)


## Start the prune-images service

[ec2-user@ip-172-25-0-222 ~]$ date; sudo systemctl start prune-images
Sat Dec 21 07:56:39 UTC 2024


## Check status of prune-images service after starting

[ec2-user@ip-172-25-0-222 ~]$ sudo systemctl status prune-images
● prune-images.service - Pruning of stale docker images
   Loaded: loaded (/etc/systemd/system/prune-images.service; static; vendor preset: disabled)
   Active: inactive (dead) since Sat 2024-12-21 07:56:39 UTC; 6s ago
  Process: 390 ExecStart=/usr/bin/docker exec gitlab-dind sh -c docker system prune --force --all --filter "until=2160h" > /proc/1/fd/1 (code=exited, status=0/SUCCESS)
  Process: 357 ExecStart=/usr/bin/docker exec gitlab-dind sh -c docker volume prune --force --all > /proc/1/fd/1 (code=exited, status=0/SUCCESS)
  Process: 335 ExecStartPre=/usr/bin/docker pull 654654270592.dkr.ecr.us-east-1.amazonaws.com/docker.io/library/docker@sha256:e0733e0529749cec359cacf2d698214338f50dfb795a4673204504016e27d1dc (code=exited, status=0/SUCCESS)
  Process: 324 ExecStartPre=/usr/bin/docker rm prune-images (code=exited, status=1/FAILURE)
  Process: 300 ExecStartPre=/usr/bin/docker stop prune-images (code=exited, status=1/FAILURE)
 Main PID: 390 (code=exited, status=0/SUCCESS)

Dec 21 07:56:39 ip-172-25-0-222.ec2.internal systemd[1]: Starting Pruning of stale docker images...
Dec 21 07:56:39 ip-172-25-0-222.ec2.internal systemd[1]: Started Pruning of stale docker images.


## Check Docker volumes, images, & containers after service completed

[ec2-user@ip-172-25-0-222 ~]$ sudo docker volume ls
DRIVER    VOLUME NAME
local     97f8eca4b8bd3b68af589c1c1bca43a4f059b7961d2fb09f9f656ef73acc9eb5

[ec2-user@ip-172-25-0-222 ~]$ sudo docker system df
TYPE            TOTAL     ACTIVE    SIZE      RECLAIMABLE
Images          3         3         4.714GB   0B (0%)
Containers      3         3         759B      0B (0%)
Local Volumes   1         1         0B        0B
Build Cache     0         0         0B        0B


## Check for log messages related to prune-images service being run

[ec2-user@ip-172-25-0-222 ~]$ sudo less /var/log/messages

...
Dec 21 07:56:39 ip-172-25-0-222 systemd: Starting Pruning of stale docker images...
Dec 21 07:56:39 ip-172-25-0-222 docker: gitlab-dind: Total reclaimed space: 0B
Dec 21 07:56:39 ip-172-25-0-222 docker: gitlab-dind: Total reclaimed space: 0B
Dec 21 07:56:39 ip-172-25-0-222 systemd: Started Pruning of stale docker images.
...

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.

Please update the unit name and description to reflect the fact that this prunes more than just images. The unit name should be docker-prune

'system', # … system command …
'prune', # … to delete, …
'--force', # … without prompting for confirmation, …
'--all', # … all unused images …
Copy link
Member

Choose a reason for hiding this comment

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

This prunes more than just images.

@dsotirho-ucsc dsotirho-ucsc force-pushed the issues/dsotirho-ucsc/6114-prune branch from 8246db1 to 23a5164 Compare January 7, 2025 17:41
@dsotirho-ucsc
Copy link
Contributor Author

6763_IT_2025-01-07.txt

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.

@hannes-ucsc hannes-ucsc added 2 reviews [process] Lead requested changes twice and removed 1 review [process] Lead requested changes once labels Jan 7, 2025
@hannes-ucsc hannes-ucsc removed their assignment Jan 7, 2025
@dsotirho-ucsc dsotirho-ucsc force-pushed the issues/dsotirho-ucsc/6114-prune branch from 23a5164 to 216317f Compare January 7, 2025 21:48
@dsotirho-ucsc
Copy link
Contributor Author

6763_IT_2025-01-07.txt

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants