github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108748 from atiratree/kube-107333-fix-cp-retries

Browse Source 
resume kubectl cp with tail when --retries is negative
This commit is contained in:
Kubernetes Prow Robot 2022-03-28 05:39:34 -07:00 committed by GitHub
commit 6c67869ff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go
View File

@ -373,7 +373,7 @@ func (t *TarPipe) initReadFrom(n uint64) {
Command: []string{"tar", "cf", "-", t.src.File.String()},
Executor: &exec.DefaultRemoteExecutor{},
}
if t.o.MaxTries > 0 {
if t.o.MaxTries != 0 {
options.Command = []string{"sh", "-c", fmt.Sprintf("tar cf - %s | tail -c+%d", t.src.File, n)}
}
@ -387,10 +387,10 @@ func (t *TarPipe) Read(p []byte) (n int, err error) {
n, err = t.reader.Read(p)
if err != nil {
if t.o.MaxTries < 0 || t.retries < t.o.MaxTries {
t.retries++
fmt.Printf("Resuming copy at %d bytes, retry %d/%d\n", t.bytesRead, t.retries, t.o.MaxTries)
t.initReadFrom(t.bytesRead + 1)
err = nil
t.retries++
} else {
fmt.Printf("Dropping out copy after %d retries\n", t.retries)
}