feature: support resize the tty of cri exec process #2063
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
YaoZengzeng
changed the title
YaoZengzeng
force-pushed
the
resize-test
branch
from
680637a
to
3148807
Compare
Codecov Report
@@ Coverage Diff @@
## master #2063 +/- ##
==========================================
+ Coverage 58.74% 63.76% +5.01%
==========================================
Files 202 202
Lines 15535 15621 +86
==========================================
+ Hits 9126 9960 +834
+ Misses 5301 4418 -883
- Partials 1108 1243 +135
|
|
@fuweid @HusterWan PTAL |
fuweid
suggested changes
Aug 8, 2018
cri/stream/config.go
Outdated
|
|
||
| // SupportedStreamingProtocols is the streaming protocols which server supports. | ||
| var SupportedStreamingProtocols = []string{constant.StreamProtocolV1Name, constant.StreamProtocolV2Name} | ||
| var SupportedStreamingProtocols = []string{constant.StreamProtocolV1Name, constant.StreamProtocolV2Name, constant.StreamProtocolV3Name} |
There was a problem hiding this comment.
could we fold this line? I think it is readable if one option is in one line.
| for { | ||
| size := apitypes.ResizeOptions{} | ||
| err := decoder.Decode(&size) | ||
| if err != nil { |
There was a problem hiding this comment.
if the err is not EOF, I think we should show the warning message.
|
|
||
| return ctx, true | ||
| } | ||
|
|
||
| func handleResizeEvents(stream io.Reader, channel chan<- apitypes.ResizeOptions) { |
There was a problem hiding this comment.
could we add the ctx or event id for log stuff?
There was a problem hiding this comment.
It seems we can't provide enough useful information in this function
So I do the log in function handleResizing from which we could know the container and exec id
| } | ||
| go func() { | ||
| for { | ||
| size, ok := <-resizeChan |
| replyChan := make(chan struct{}) | ||
| stop := make(chan struct{}) | ||
| defer close(stop) | ||
| WaitForStreams: |
There was a problem hiding this comment.
should we change the break label here? it looks like the function name...
YaoZengzeng
force-pushed
the
resize-test
branch
from
3148807
to
b01db9d
Compare
|
@fuweid Updated. |
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
YaoZengzeng
force-pushed
the
resize-test
branch
from
b01db9d
to
6385f31
Compare
This was referenced Aug 9, 2018
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.
Signed-off-by: YaoZengzeng yaozengzeng@zju.edu.cn
Ⅰ. Describe what this PR did
Get resize request from resize stream
Put the resize request to channel
Spawn goroutine to process the request from channel
Call the container manager's
ResizeExecmethodCall the ctrd's
ResizeExecmethodⅡ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews