Bug 1387418: Handle empty push resultset from hg #9074
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch parses the hg push resultset and handles cases where pushes are not present by raising an appropriate error and logging the error correctly.
Archaeopteryx
requested changes
Nov 18, 2025
Collaborator
Archaeopteryx
left a comment
Archaeopteryx
left a comment
There was a problem hiding this comment.
Thank you for the patch. Please ask if there are questions about the review comments.
treeherder/etl/push_loader.py
Outdated
| try: | ||
| data = fetch_json(url) | ||
| except Exception as e: | ||
| logger.exception("Failed fetching push JSON from %s for %s: %s", url, repository, e) |
Collaborator
There was a problem hiding this comment.
Please use an f-string.
Contributor
Author
There was a problem hiding this comment.
Added in latest commit
treeherder/etl/push_loader.py
Outdated
| pushes = data.get("pushes") | ||
|
|
||
| if not pushes or not isinstance(pushes, dict): | ||
| # Log deg info and raise error |
Collaborator
There was a problem hiding this comment.
What does deg mean?
Contributor
Author
There was a problem hiding this comment.
This was a typo. I have corrected this in the latest commit.
treeherder/etl/push_loader.py
Outdated
| {"url": url, "repository": repository, "data_keys": data_keys}, | ||
| ) | ||
| except Exception: | ||
| logger.debug("NewRelic event failed for malformed data") |
Collaborator
There was a problem hiding this comment.
Please reword: NewRelic event failed for malformed Hg push data
Contributor
Author
There was a problem hiding this comment.
Thanks. I have made the updates.
treeherder/etl/push_loader.py
Outdated
| try: | ||
| push = next(iter(pushes.values())) | ||
| except Exception as e: | ||
| logger.exception("Failed to extract first push from pushes for {respository} {url}:{e}") |
Collaborator
There was a problem hiding this comment.
f-string declaration missing
treeherder/etl/push_loader.py
Outdated
| pass | ||
|
|
||
|
|
||
| class ResultsetFetchError(Exception): |
Collaborator
There was a problem hiding this comment.
Please use HgPushFetchError instead
Contributor
Author
There was a problem hiding this comment.
Changes implemented.
treeherder/etl/push_loader.py
Outdated
| logger.exception("Failed fetching push JSON from %s for %s: %s", url, repository, e) | ||
| try: | ||
| newrelic.agent.record_custom_event( | ||
| "resultset_fetch_failure", |
Collaborator
There was a problem hiding this comment.
Please use hg_push_fetch_failure instead.
Contributor
Author
There was a problem hiding this comment.
Changes Implemented
treeherder/etl/push_loader.py
Outdated
| except Exception: | ||
| # NewRelic failures should not block ingestion | ||
| logger.debug("NewRelic event failed for fetch error") | ||
| raise ResultsetFetchError(f"Failed to fecth JSON from {url}: {e}") from e |
Contributor
Author
There was a problem hiding this comment.
Thanks. This has been corrected.
treeherder/etl/push_loader.py
Outdated
| ) | ||
| try: | ||
| newrelic.agent.record_custom_event( | ||
| "resultset_fetch_malformed", |
Collaborator
There was a problem hiding this comment.
Please use hg_push_fetch_malformed instead.
Made the below changes to push_loader.py * Used an f-string in line 267 to log exception * Corrected comment where we log data in warning * Used `NewRelic event failed for malformed Hg push data` in place of `NewRelic event failed for malformed data` * Inserted f-string declaration and corrected typo in it too * Renamed `ResultsetFetchError` to `HgPushFetchError` * Renamed `resultset_fetch_failure` to `hg_push_fetch_failure` * Corrected typo from `fecht` to `fetch` Made the below change to test_push_loader.py * Replace `ResultsetFetchError` with `HgPushFetchError`
Contributor
Author
|
Thank you for reviewing it and providing your feedback. Changes to
Change to
|
Archaeopteryx
pushed a commit
that referenced
this pull request
Nov 24, 2025
* Bug 1387418: Handle empty push resultset from hg This patch parses the hg push resultset and handles cases where pushes are not present by raising an appropriate error and logging the error correctly. * Bug 1387418: Address review comments Made the below changes to push_loader.py * Used an f-string in line 267 to log exception * Corrected comment where we log data in warning * Used `NewRelic event failed for malformed Hg push data` in place of `NewRelic event failed for malformed data` * Inserted f-string declaration and corrected typo in it too * Renamed `ResultsetFetchError` to `HgPushFetchError` * Renamed `resultset_fetch_failure` to `hg_push_fetch_failure` * Corrected typo from `fecht` to `fetch` Made the below change to test_push_loader.py * Replace `ResultsetFetchError` with `HgPushFetchError`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes Introduced
This patch parses the hg push resultset and handles cases where pushes are not present by raising an appropriate error and logging the error correctly.
Testing Information
tests/etl/test_push_loader.pyto validate that the appropriate exception is raised whenfetch_jsonreturns adictwithoutpushes