e25352a42a
goimports -w \
-- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli" \
&& \
gofmt -w -s \
-- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli"
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 59e55dcdd0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
113 lines
3 KiB
Go
113 lines
3 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types/versions"
|
|
"github.com/docker/docker/internal/test/request"
|
|
"gotest.tools/assert"
|
|
)
|
|
|
|
func (s *DockerSuite) TestExecResizeAPIHeightWidthNoInt(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
endpoint := "/exec/" + cleanedContainerID + "/resize?h=foo&w=bar"
|
|
res, _, err := request.Post(endpoint)
|
|
assert.NilError(c, err)
|
|
if versions.LessThan(testEnv.DaemonAPIVersion(), "1.32") {
|
|
assert.Equal(c, res.StatusCode, http.StatusInternalServerError)
|
|
} else {
|
|
assert.Equal(c, res.StatusCode, http.StatusBadRequest)
|
|
}
|
|
}
|
|
|
|
// Part of #14845
|
|
func (s *DockerSuite) TestExecResizeImmediatelyAfterExecStart(c *testing.T) {
|
|
name := "exec_resize_test"
|
|
dockerCmd(c, "run", "-d", "-i", "-t", "--name", name, "--restart", "always", "busybox", "/bin/sh")
|
|
|
|
testExecResize := func() error {
|
|
data := map[string]interface{}{
|
|
"AttachStdin": true,
|
|
"Cmd": []string{"/bin/sh"},
|
|
}
|
|
uri := fmt.Sprintf("/containers/%s/exec", name)
|
|
res, body, err := request.Post(uri, request.JSONBody(data))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if res.StatusCode != http.StatusCreated {
|
|
return fmt.Errorf("POST %s is expected to return %d, got %d", uri, http.StatusCreated, res.StatusCode)
|
|
}
|
|
|
|
buf, err := request.ReadBody(body)
|
|
assert.NilError(c, err)
|
|
|
|
out := map[string]string{}
|
|
err = json.Unmarshal(buf, &out)
|
|
if err != nil {
|
|
return fmt.Errorf("ExecCreate returned invalid json. Error: %q", err.Error())
|
|
}
|
|
|
|
execID := out["Id"]
|
|
if len(execID) < 1 {
|
|
return fmt.Errorf("ExecCreate got invalid execID")
|
|
}
|
|
|
|
payload := bytes.NewBufferString(`{"Tty":true}`)
|
|
conn, _, err := sockRequestHijack("POST", fmt.Sprintf("/exec/%s/start", execID), payload, "application/json", request.DaemonHost())
|
|
if err != nil {
|
|
return fmt.Errorf("Failed to start the exec: %q", err.Error())
|
|
}
|
|
defer conn.Close()
|
|
|
|
_, rc, err := request.Post(fmt.Sprintf("/exec/%s/resize?h=24&w=80", execID), request.ContentType("text/plain"))
|
|
if err != nil {
|
|
// It's probably a panic of the daemon if io.ErrUnexpectedEOF is returned.
|
|
if err == io.ErrUnexpectedEOF {
|
|
return fmt.Errorf("The daemon might have crashed.")
|
|
}
|
|
// Other error happened, should be reported.
|
|
return fmt.Errorf("Fail to exec resize immediately after start. Error: %q", err.Error())
|
|
}
|
|
|
|
rc.Close()
|
|
|
|
return nil
|
|
}
|
|
|
|
// The panic happens when daemon.ContainerExecStart is called but the
|
|
// container.Exec is not called.
|
|
// Because the panic is not 100% reproducible, we send the requests concurrently
|
|
// to increase the probability that the problem is triggered.
|
|
var (
|
|
n = 10
|
|
ch = make(chan error, n)
|
|
wg sync.WaitGroup
|
|
)
|
|
for i := 0; i < n; i++ {
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
if err := testExecResize(); err != nil {
|
|
ch <- err
|
|
}
|
|
}()
|
|
}
|
|
|
|
wg.Wait()
|
|
select {
|
|
case err := <-ch:
|
|
c.Fatal(err.Error())
|
|
default:
|
|
}
|
|
}
|