Skip to content

Commit

Permalink
Fixed repository version repair with S3 and Azure storage
Browse files Browse the repository at this point in the history
This patch also adds repair API tests for S3 and Azure storage backends.

fixes: pulp#4776
fixes: pulp#4806
  • Loading branch information
dkliban committed Dec 1, 2023
1 parent 701bbc4 commit ff52de9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 29 deletions.
2 changes: 2 additions & 0 deletions CHANGES/4776.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed a bug in the repository version repair API which would present itself when using Pulp with S3
and Azure storage backends.
2 changes: 2 additions & 0 deletions CHANGES/4806.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed a bug in the repository version repair API which would present itself when using Pulp with S3
and Azure storage backends.
5 changes: 3 additions & 2 deletions pulpcore/app/tasks/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,11 @@ async def _repair_ca(content_artifact, repaired=None):


def _verify_artifact(artifact):
domain = get_domain()
storage = domain.get_storage()
try:
# verify files digest
hasher = hashlib.sha256()
with artifact.file as fp:
with storage.open(artifact.file.name) as fp:
for chunk in fp.chunks(CHUNK_SIZE):
hasher.update(chunk)
return hasher.hexdigest() == artifact.sha256
Expand Down
34 changes: 7 additions & 27 deletions pulpcore/tests/functional/api/using_plugin/test_repair.py
Original file line number Diff line number Diff line change
@@ -1,29 +1,14 @@
import pytest
import os

from django.core.files.storage import default_storage
from random import sample

from pulpcore.client.pulpcore import Repair
from pulpcore.client.pulp_file import RepositorySyncURL

from pulpcore.app import settings

from pulpcore.tests.functional.utils import get_files_in_manifest


SUPPORTED_STORAGE_FRAMEWORKS = [
"django.core.files.storage.FileSystemStorage",
"pulpcore.app.models.storage.FileSystem",
]

pytestmark = pytest.mark.skipif(
settings.DEFAULT_FILE_STORAGE not in SUPPORTED_STORAGE_FRAMEWORKS,
reason="Cannot simulate bit-rot on this storage platform ({}).".format(
settings.DEFAULT_FILE_STORAGE
),
)


@pytest.fixture
def repository_with_corrupted_artifacts(
file_repository_api_client,
Expand All @@ -42,19 +27,14 @@ def repository_with_corrupted_artifacts(
# STEP 2: sample artifacts that will be modified on the filesystem later on
content1, content2 = sample(get_files_in_manifest(remote.url), 2)

# Modify one artifact on disk.
artifact1_path = os.path.join(
settings.MEDIA_ROOT, artifacts_api_client.list(sha256=content1[1]).results[0].file
)
with open(artifact1_path, "r+b") as f:
# Modify an artifact
artifact1_path = artifacts_api_client.list(sha256=content1[1]).results[0].file
with default_storage.open(artifact1_path, "w+b") as f:
f.write(b"$a bit rot")

# Delete another one from disk.
artifact2_path = os.path.join(
settings.MEDIA_ROOT, artifacts_api_client.list(sha256=content2[1]).results[0].file
)
os.remove(artifact2_path)

# Delete an artifact
artifact2_path = artifacts_api_client.list(sha256=content2[1]).results[0].file
default_storage.delete(artifact2_path)
return repo


Expand Down

0 comments on commit ff52de9

Please sign in to comment.