bridge: fix multiple close in fswatch1 #20634
Merged
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
We call `self._watch.close()` and then set `self._watch = None` which means that if the function gets called twice we crash. Those crashes have been showing up with increasing frequency in cockpit-files, so let's fix them. Proper type annotations on this class would have forbidden this code in the first place, so let's add them now. I've known about this issue for a while but I've put off fixing it because we should probably sort out why .do_close() gets called twice in the first place. Let's fix this anyway, though, since it's causing annoying failures in the meantime.
allisonkarlitskaya
merged commit e79488d
into
cockpit-project:main
81 of 83 checks passed
This was referenced Aug 13, 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.
We call
self._watch.close()and then setself._watch = Nonewhich means that if the function gets called twice we crash. Those crashes have been showing up with increasing frequency in cockpit-files, so let's fix them.Proper type annotations on this class would have forbidden this code in the first place, so let's add them now.
I've known about this issue for a while but I've put off fixing it because we should probably sort out why .do_close() gets called twice in the first place. Let's fix this anyway, though, since it's causing annoying failures in the meantime.