Skip to content

[COST-7501] fix DiskCapacity scraper IntegrityError #6063

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.

Sign up for GitHub

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

Merged
djnakabaale merged 2 commits into from
May 20, 2026
+15 −2
Merged

[COST-7501] fix DiskCapacity scraper IntegrityError #6063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3ac36a
fix DiskCapacity scraper IntegrityError by switching to update_or_create
djnakabaale May 15, 2026
40e2372
Merge branch 'main' into fix-diskcap-update-or-create
djnakabaale May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions koku/masu/celery/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,10 @@ def scrape_azure_storage_capacities():
disk_size_mapping = disk_fetcher.scrape_disk_size()
if disk_size_mapping:
for sku_prefix, disk_size in disk_size_mapping.items():
DiskCapacity.objects.get_or_create(
DiskCapacity.objects.update_or_create(
product_substring=sku_prefix,
capacity=disk_size,
provider_type=Provider.PROVIDER_AZURE,
defaults={"capacity": disk_size},
)
Comment thread
djnakabaale marked this conversation as resolved.
return disk_size_mapping

Expand Down
13 changes: 13 additions & 0 deletions koku/masu/test/celery/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,19 @@ def test_scrape_azure_storage_capacities(self, mock_celery_app):
self.assertNotEqual(beforeRows, afterRows)
self.assertEqual(afterRows, 14)

@patch("masu.celery.tasks.celery_app")
def test_scrape_azure_storage_capacities_updates_stale_capacity(self, mock_celery_app):
"""Test that scraping updates an existing row whose capacity has changed."""
adsf = AzureDiskSizeScraper()
DiskCapacity.objects.all().delete()
DiskCapacity.objects.create(product_substring="P80", capacity=99999, provider_type=Provider.PROVIDER_AZURE)
with requests_mock.mock() as reqmock:
reqmock.register_uri("GET", adsf.url, status_code=200, text=test_azure_scrape_output)
tasks.scrape_azure_storage_capacities()
p80 = DiskCapacity.objects.get(product_substring="P80")
self.assertEqual(p80.capacity, 32768)
self.assertEqual(DiskCapacity.objects.count(), 14)

def test_error_scrape_azure_storage_capacities(self):
"""Test HTTP error capture."""
adsf = AzureDiskSizeScraper()
Expand Down
Loading