No need to write address twice #331
Open
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
Optimize code Signed-off-by: jokemanfire <hu.dingyang@zte.com.cn>
mxpv
reviewed
Oct 30, 2024
| @@ -260,8 +260,7 @@ pub async fn spawn(opts: StartOpts, grouping: &str, vars: Vec<(&str, &str)>) -> | |||
| return Err(e); | |||
| }; | |||
| } | |||
| if let Ok(()) = wait_socket_working(&address, 5, 200).await { | |||
| write_str_to_file("address", &address).await?; | |||
| if wait_socket_working(&address, 5, 200).await.is_ok() { | |||
There was a problem hiding this comment.
while the service's start_shim call spawn , if the spawn return ok ,will write address again.
There was a problem hiding this comment.
@jokemanfire this isn't the same as writing it to the std_out. This is writing it to the oci bundle path as a file. I believe this is required so that if containerd restarts it knows how to reconnect to the shim:
There was a problem hiding this comment.
Thanks @jsturtevant , I know the socket address will be written but I feel confuse about this rshim
let vars: Vec<(&str, &str)> = vec![("THP_DISABLED", thp_disabled.as_str())];
let address = spawn(opts, &grouping, vars).await?;
write_str_to_file("address", &address).await?;
also write address to address's file again .
but the func spawn return type is ok.
There was a problem hiding this comment.
I'm seeing two times "false" written to my container logs?
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.
Optimize code