mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 05:17:02 +00:00
Jing Chen
3914a449d4
Race: clientStream.Send and Close both reach ttrpc's unsynchronized localClosed flag. readByteStream.window is written by the window goroutine and by Read, so make it atomic. Deadlock: Read the window by bytes copied instead of bytes received, so a short read leaves the window above windowSize. Signed-off-by: Jing Chen <milantracy@gmail.com>
124 lines
2.6 KiB
Go
124 lines
2.6 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package streaming
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"sync/atomic"
|
|
|
|
transferapi "github.com/containerd/containerd/api/types/transfer"
|
|
"github.com/containerd/containerd/v2/core/streaming"
|
|
"github.com/containerd/typeurl/v2"
|
|
)
|
|
|
|
type readByteStream struct {
|
|
ctx context.Context
|
|
stream streaming.Stream
|
|
window atomic.Int32
|
|
updated chan struct{}
|
|
errCh chan error
|
|
remaining []byte
|
|
}
|
|
|
|
func ReadByteStream(ctx context.Context, stream streaming.Stream) io.ReadCloser {
|
|
rbs := &readByteStream{
|
|
ctx: ctx,
|
|
stream: stream,
|
|
errCh: make(chan error, 1),
|
|
updated: make(chan struct{}, 1),
|
|
}
|
|
go func() {
|
|
for {
|
|
if rbs.window.Load() >= windowSize {
|
|
select {
|
|
case <-ctx.Done():
|
|
return
|
|
case <-rbs.updated:
|
|
continue
|
|
}
|
|
}
|
|
update := &transferapi.WindowUpdate{
|
|
Update: windowSize,
|
|
}
|
|
anyType, err := typeurl.MarshalAny(update)
|
|
if err != nil {
|
|
rbs.errCh <- err
|
|
return
|
|
}
|
|
if err := stream.Send(anyType); err != nil {
|
|
// Read reports stream errors.
|
|
return
|
|
}
|
|
rbs.window.Add(windowSize)
|
|
}
|
|
|
|
}()
|
|
return rbs
|
|
}
|
|
|
|
func (r *readByteStream) Read(p []byte) (n int, err error) {
|
|
plen := len(p)
|
|
if len(r.remaining) > 0 {
|
|
copied := copy(p, r.remaining)
|
|
if len(r.remaining) > plen {
|
|
r.remaining = r.remaining[plen:]
|
|
} else {
|
|
r.remaining = nil
|
|
}
|
|
return copied, nil
|
|
}
|
|
select {
|
|
case <-r.ctx.Done():
|
|
return 0, r.ctx.Err()
|
|
case err := <-r.errCh:
|
|
return 0, err
|
|
default:
|
|
}
|
|
anyType, err := r.stream.Recv()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
i, err := typeurl.UnmarshalAny(anyType)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
switch v := i.(type) {
|
|
case *transferapi.Data:
|
|
n := copy(p, v.Data)
|
|
if len(v.Data) > plen {
|
|
r.remaining = v.Data[plen:]
|
|
}
|
|
if r.window.Add(-int32(len(v.Data))) < windowSize {
|
|
select {
|
|
case r.updated <- struct{}{}:
|
|
default:
|
|
// Don't block if the window goroutine has ended.
|
|
}
|
|
}
|
|
return n, nil
|
|
default:
|
|
return 0, fmt.Errorf("stream received error type %v", v)
|
|
}
|
|
|
|
}
|
|
|
|
func (r *readByteStream) Close() error {
|
|
return r.stream.Close()
|
|
}
|