cloud-api-adaptor: SecureComms fix panic for closing chan twice #2014
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
davidhadas
force-pushed
the
protect-chan-close
branch
from
a6edaf5 to
ccc518d
Compare
yoheiueda
reviewed
Aug 20, 2024
Comment on lines
302
to
310
| peer.mutex.Lock() | ||
| defer peer.mutex.Unlock() | ||
|
|
||
| if peer.terminated == "" { | ||
| logger.Printf("%s phase: peer done by >>> %s <<<", peer.phase, who) | ||
| peer.terminated = who | ||
| if peer.terminated == "" { | ||
| peer.terminated = "(unspecified)" | ||
| } |
There was a problem hiding this comment.
Can we use sync.Once here to simplify the logic?
There was a problem hiding this comment.
The function may run multiple times (for different peer objects). So it seems based on what I read that sync.Once does not fit here.
There was a problem hiding this comment.
I think you can add a sync.Once object into the SshPeer struct instead of sync.Mutex, then we can call Close() multiple times for different peer objects.
func (peer *SshPeer) Close(who string) {
peer.once.Do(func() {
logger.Printf("%s phase: peer done by >>> %s <<<", peer.phase, who)
peer.sshConn.Close()
close(peer.done)
})
}
I think we can also eliminate the terminated field from the struct.
Fixes: confidential-containers#2012 Avoid closing an already closed chan. Signed-off-by: David Hadas <david.hadas@gmail.com>
davidhadas
force-pushed
the
protect-chan-close
branch
from
ccc518d to
6cbc206
Compare
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.
Fixes: #2012
Avoid closing an already closed chan.