Fix admin repo startup deadlock because of rill.yaml read #4762
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
begelundmuller
requested changes
Apr 30, 2024
runtime/drivers/admin/admin.go
Outdated
Comment on lines
268
to
276
| // Read rill.yaml and fill in `ignore_paths` | ||
| rawYaml, err := h.Get(context.Background(), "/rill.yaml") | ||
| if err == nil { | ||
| yml := &rillYAML{} | ||
| err = yaml.Unmarshal([]byte(rawYaml), yml) | ||
| if err == nil { | ||
| h.ignorePaths = yml.IgnorePaths | ||
| } | ||
| } |
There was a problem hiding this comment.
This will read rill.yaml and mutate ignorePaths without holding repoMu.
I think putting it back in the singleflight and using os.ReadFile directly (or an internal get that doesn't take a lock) would be a simpler approach
AdityaHegde
added
the
blocker
begelundmuller
approved these changes
Apr 30, 2024
k-anshul
pushed a commit
that referenced
this pull request
Apr 30, 2024
* Fix admin repo startup deadlock * Moving inside lock
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.
No description provided.