allow discovery to re-run if files are missing; log errors #11055
Conversation
This file contains 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
brettfo
commented
Dec 4, 2024
| @dependencies ||= T.let(begin | ||
| NativeDiscoveryJsonReader.debug_report_discovery_files(error_if_missing: true) | ||
| directory = source&.directory || "/" | ||
| discovery_json_reader = NativeDiscoveryJsonReader.run_discovery_in_directory( |
There was a problem hiding this comment.
This method will return the existing discovery JSON if it exists from the previous run, or run it again if required.
brettfo
commented
Dec 4, 2024
brettfo
commented
Dec 4, 2024
brettfo
commented
Dec 4, 2024
| "#{File.read(discovery_map_file_path)}") | ||
| Dependabot.logger.info("Discovery files: #{Dir.glob(File.join(discovery_directory, '*'))}") | ||
| elsif error_if_missing | ||
| Dependabot.logger.error("discovery map file missing") |
There was a problem hiding this comment.
This allows PR creation to continue, but will make a handy search point in the logs.
brettfo
commented
Dec 4, 2024
| @@ -7,5 +7,19 @@ echo "NuGet native updater experiment value: $nuget_experiment_value" | |||
| if echo "$nuget_experiment_value" | grep -q 'true'; then | |||
| pwsh "$DEPENDABOT_HOME/dependabot-updater/bin/main.ps1" $* | |||
| else | |||
| operation=$1 | |||
| dot_dependabot_directory="$DEPENDABOT_HOME/.dependabot" | |||
| discovery_map_path="$dot_dependabot_directory/discovery_map.json" | |||
There was a problem hiding this comment.
These checks are just to see what exists on disk before and after the processes are started/ended to help narrow down when and where the files are getting deleted.
sebasgomez238
approved these changes
Dec 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Despite a recent PR, it still seems possible for the discovery JSON files to go missing between
fetch_filesandupdate_files.This PR allows the update job to continue by re-running discovery if necessary, but also logs in several locations what discovery files were produced so we can hopefully figure out where they're going. Re-running discovery is faster the second time because packages have already been downloaded and only adds 30s or so to the update.
I manually verified the re-run behavior works by manually deleting the discovery JSON files between
fetch_filesandupdate_filesand the appropriate errors were reported and discovery was re-run and the update job completed as expected.