-
-
Notifications
You must be signed in to change notification settings - Fork 4.5k
bug(preprod): Create PENDING record for comparisons in POST handler to prevent empty state in compare page #101454
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,9 +102,7 @@ def compare_preprod_artifact_size_analysis( | |
| ), | ||
| }, | ||
| ) | ||
| _run_size_analysis_comparison( | ||
| project_id, org_id, matching_head_size_metric, base_metric | ||
| ) | ||
| _run_size_analysis_comparison(org_id, matching_head_size_metric, base_metric) | ||
| else: | ||
| logger.info( | ||
| "preprod.size_analysis.compare.no_matching_base_size_metric", | ||
|
|
@@ -157,9 +155,7 @@ def compare_preprod_artifact_size_analysis( | |
| "preprod.size_analysis.compare.running_comparison", | ||
| extra={"base_artifact_id": artifact_id, "head_artifact_id": head_artifact.id}, | ||
| ) | ||
| _run_size_analysis_comparison( | ||
| project_id, org_id, head_metric, matching_base_size_metric | ||
| ) | ||
| _run_size_analysis_comparison(org_id, head_metric, matching_base_size_metric) | ||
| else: | ||
| logger.info( | ||
| "preprod.size_analysis.compare.no_matching_base_size_metric", | ||
|
|
@@ -262,9 +258,7 @@ def manual_size_analysis_comparison( | |
| ), | ||
| }, | ||
| ) | ||
| _run_size_analysis_comparison( | ||
| project_id, org_id, matching_head_size_metric, base_metric | ||
| ) | ||
| _run_size_analysis_comparison(org_id, matching_head_size_metric, base_metric) | ||
| else: | ||
| logger.info( | ||
| "preprod.size_analysis.compare.manual.no_matching_base_size_metric", | ||
|
|
@@ -278,19 +272,19 @@ def manual_size_analysis_comparison( | |
|
|
||
|
|
||
| def _run_size_analysis_comparison( | ||
| project_id: int, | ||
| org_id: int, | ||
| head_size_metric: PreprodArtifactSizeMetrics, | ||
| base_size_metric: PreprodArtifactSizeMetrics, | ||
| ): | ||
| comparison = None | ||
| try: | ||
| comparison = PreprodArtifactSizeComparison.objects.get( | ||
| head_size_analysis=head_size_metric, | ||
| base_size_analysis=base_size_metric, | ||
| organization_id=org_id, | ||
| ) | ||
|
|
||
| # Existing comparison exists or is already running, | ||
| # Skip if comparison is already complete or currently running | ||
| if comparison.state in [ | ||
| PreprodArtifactSizeComparison.State.PROCESSING, | ||
| PreprodArtifactSizeComparison.State.SUCCESS, | ||
|
|
@@ -301,10 +295,21 @@ def _run_size_analysis_comparison( | |
| extra={ | ||
| "head_artifact_size_metric_id": head_size_metric.id, | ||
| "base_artifact_size_metric_id": base_size_metric.id, | ||
| "state": comparison.state, | ||
| }, | ||
| ) | ||
| return | ||
|
|
||
| # PENDING state - transition to PROCESSING | ||
| if comparison.state == PreprodArtifactSizeComparison.State.PENDING: | ||
| logger.info( | ||
| "preprod.size_analysis.compare.transitioning_pending_to_processing", | ||
| extra={ | ||
| "head_artifact_size_metric_id": head_size_metric.id, | ||
| "base_artifact_size_metric_id": base_size_metric.id, | ||
| }, | ||
| ) | ||
|
|
||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I can't tag the line number but I think the error handling we have should now update the comparison to |
||
| except PreprodArtifactSizeComparison.DoesNotExist: | ||
| logger.info( | ||
| "preprod.size_analysis.compare.no_existing_comparison", | ||
|
|
@@ -313,6 +318,14 @@ def _run_size_analysis_comparison( | |
| "base_artifact_size_metric_id": base_size_metric.id, | ||
| }, | ||
| ) | ||
| with transaction.atomic(router.db_for_write(PreprodArtifactSizeComparison)): | ||
| comparison = PreprodArtifactSizeComparison.objects.create( | ||
| head_size_analysis=head_size_metric, | ||
| base_size_analysis=base_size_metric, | ||
| organization_id=org_id, | ||
| state=PreprodArtifactSizeComparison.State.FAILED, | ||
| ) | ||
| comparison.save() | ||
| pass | ||
|
|
||
| try: | ||
|
|
@@ -325,6 +338,8 @@ def _run_size_analysis_comparison( | |
| "head_artifact_id": head_size_metric.preprod_artifact.id, | ||
| }, | ||
| ) | ||
| comparison.state = PreprodArtifactSizeComparison.State.FAILED | ||
| comparison.save() | ||
| return | ||
|
|
||
| try: | ||
|
|
@@ -337,6 +352,9 @@ def _run_size_analysis_comparison( | |
| "base_artifact_id": base_size_metric.preprod_artifact.id, | ||
| }, | ||
| ) | ||
| with transaction.atomic(router.db_for_write(PreprodArtifactSizeComparison)): | ||
| comparison.state = PreprodArtifactSizeComparison.State.FAILED | ||
| comparison.save() | ||
| return | ||
|
|
||
| head_size_analysis_results = SizeAnalysisResults.parse_raw(head_analysis_file.getfile().read()) | ||
|
|
@@ -350,12 +368,28 @@ def _run_size_analysis_comparison( | |
| }, | ||
| ) | ||
|
|
||
| comparison = PreprodArtifactSizeComparison.objects.create( | ||
| head_size_analysis=head_size_metric, | ||
| base_size_analysis=base_size_metric, | ||
| organization_id=org_id, | ||
| state=PreprodArtifactSizeComparison.State.PROCESSING, | ||
| ) | ||
| # Update existing PENDING comparison or create new one | ||
| with transaction.atomic(router.db_for_write(PreprodArtifactSizeComparison)): | ||
| if comparison: | ||
| comparison.state = PreprodArtifactSizeComparison.State.PROCESSING | ||
| comparison.save() | ||
| else: | ||
| logger.info( | ||
| "preprod.size_analysis.compare.no_existing_comparison", | ||
| extra={ | ||
| "head_artifact_size_metric_id": head_size_metric.id, | ||
| "base_artifact_size_metric_id": base_size_metric.id, | ||
| }, | ||
| ) | ||
| with transaction.atomic(router.db_for_write(PreprodArtifactSizeComparison)): | ||
| comparison = PreprodArtifactSizeComparison.objects.create( | ||
| head_size_analysis=head_size_metric, | ||
| base_size_analysis=base_size_metric, | ||
| organization_id=org_id, | ||
| state=PreprodArtifactSizeComparison.State.FAILED, | ||
| ) | ||
| comparison.save() | ||
| return | ||
|
|
||
| comparison_results = compare_size_analysis( | ||
| head_size_analysis=head_size_metric, | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't used by the frontend currently, so no need to update any FE types