Skip to content

Commit 2442502

Browse files
wonderflowLK4D4
wonderflow
authored and
LK4D4
committed
remove execCreate & execStart from job
Also removed the function ExecConfigFromJob Signed-off-by: Sun Jianbo <[email protected]> Signed-off-by: Alexander Morozov <[email protected]>
1 parent ccbb93e commit 2442502

6 files changed

Lines changed: 52 additions & 91 deletions

File tree

‎api/client/exec.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ func (cli *DockerCli) CmdExec(args ...string) error {
3232
if err := json.NewDecoder(stream).Decode(&response); err != nil {
3333
return err
3434
}
35-
for _, warning := range response.Warnings {
36-
fmt.Fprintf(cli.err, "WARNING: %s\n", warning)
37-
}
3835

3936
execID := response.ID
4037

@@ -43,12 +40,18 @@ func (cli *DockerCli) CmdExec(args ...string) error {
4340
return nil
4441
}
4542

43+
//Temp struct for execStart so that we don't need to transfer all the execConfig
44+
execStartCheck := &types.ExecStartCheck{
45+
Detach: execConfig.Detach,
46+
Tty: execConfig.Tty,
47+
}
48+
4649
if !execConfig.Detach {
4750
if err := cli.CheckTtyInput(execConfig.AttachStdin, execConfig.Tty); err != nil {
4851
return err
4952
}
5053
} else {
51-
if _, _, err := readBody(cli.call("POST", "/exec/"+execID+"/start", execConfig, nil)); err != nil {
54+
if _, _, err := readBody(cli.call("POST", "/exec/"+execID+"/start", execStartCheck, nil)); err != nil {
5255
return err
5356
}
5457
// For now don't print this - wait for when we support exec wait()

‎api/server/server.go‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package server
22

33
import (
4-
"bufio"
5-
"bytes"
64
"runtime"
75
"time"
86

@@ -1393,35 +1391,27 @@ func (s *Server) postContainerExecCreate(eng *engine.Engine, version version.Ver
13931391
if err := parseForm(r); err != nil {
13941392
return nil
13951393
}
1396-
var (
1397-
name = vars["name"]
1398-
job = eng.Job("execCreate", name)
1399-
stdoutBuffer = bytes.NewBuffer(nil)
1400-
outWarnings []string
1401-
warnings = bytes.NewBuffer(nil)
1402-
)
1394+
name := vars["name"]
14031395

1404-
if err := job.DecodeEnv(r.Body); err != nil {
1396+
execConfig := &runconfig.ExecConfig{}
1397+
if err := json.NewDecoder(r.Body).Decode(execConfig); err != nil {
14051398
return err
14061399
}
1400+
execConfig.Container = name
1401+
1402+
if len(execConfig.Cmd) == 0 {
1403+
return fmt.Errorf("No exec command specified")
1404+
}
14071405

1408-
job.Stdout.Add(stdoutBuffer)
1409-
// Read warnings from stderr
1410-
job.Stderr.Add(warnings)
14111406
// Register an instance of Exec in container.
1412-
if err := job.Run(); err != nil {
1413-
fmt.Fprintf(os.Stderr, "Error setting up exec command in container %s: %s\n", name, err)
1407+
id, err := s.daemon.ContainerExecCreate(execConfig)
1408+
if err != nil {
1409+
logrus.Errorf("Error setting up exec command in container %s: %s", name, err)
14141410
return err
14151411
}
1416-
// Parse warnings from stderr
1417-
scanner := bufio.NewScanner(warnings)
1418-
for scanner.Scan() {
1419-
outWarnings = append(outWarnings, scanner.Text())
1420-
}
14211412

14221413
return writeJSON(w, http.StatusCreated, &types.ContainerExecCreateResponse{
1423-
ID: engine.Tail(stdoutBuffer, 1),
1424-
Warnings: outWarnings,
1414+
ID: id,
14251415
})
14261416
}
14271417

@@ -1431,15 +1421,18 @@ func (s *Server) postContainerExecStart(eng *engine.Engine, version version.Vers
14311421
return nil
14321422
}
14331423
var (
1434-
name = vars["name"]
1435-
job = eng.Job("execStart", name)
1436-
errOut io.Writer = os.Stderr
1424+
execName = vars["name"]
1425+
stdin io.ReadCloser
1426+
stdout io.Writer
1427+
stderr io.Writer
14371428
)
14381429

1439-
if err := job.DecodeEnv(r.Body); err != nil {
1430+
execStartCheck := &types.ExecStartCheck{}
1431+
if err := json.NewDecoder(r.Body).Decode(execStartCheck); err != nil {
14401432
return err
14411433
}
1442-
if !job.GetenvBool("Detach") {
1434+
1435+
if !execStartCheck.Detach {
14431436
// Setting up the streaming http interface.
14441437
inStream, outStream, err := hijackServer(w)
14451438
if err != nil {
@@ -1455,21 +1448,20 @@ func (s *Server) postContainerExecStart(eng *engine.Engine, version version.Vers
14551448
fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
14561449
}
14571450

1458-
if !job.GetenvBool("Tty") && version.GreaterThanOrEqualTo("1.6") {
1451+
if !execStartCheck.Tty && version.GreaterThanOrEqualTo("1.6") {
14591452
errStream = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
14601453
outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
14611454
} else {
14621455
errStream = outStream
14631456
}
1464-
job.Stdin.Add(inStream)
1465-
job.Stdout.Add(outStream)
1466-
job.Stderr.Set(errStream)
1467-
errOut = outStream
1457+
stdin = inStream
1458+
stdout = outStream
1459+
stderr = errStream
14681460
}
14691461
// Now run the user process in container.
1470-
job.SetCloseIO(false)
1471-
if err := job.Run(); err != nil {
1472-
fmt.Fprintf(errOut, "Error starting exec command in container %s: %s\n", name, err)
1462+
1463+
if err := s.daemon.ContainerExecStart(execName, stdin, stdout, stderr); err != nil {
1464+
logrus.Errorf("Error starting exec command in container %s: %s", execName, err)
14731465
return err
14741466
}
14751467
w.WriteHeader(http.StatusNoContent)

‎api/types/types.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ type ContainerCreateResponse struct {
1616
type ContainerExecCreateResponse struct {
1717
// ID is the exec ID.
1818
ID string `json:"Id"`
19-
20-
// Warnings are any warnings encountered during the execution of the command.
21-
Warnings []string `json:"Warnings"`
2219
}
2320

2421
// POST /auth
@@ -156,3 +153,12 @@ type Info struct {
156153
Name string
157154
Labels []string
158155
}
156+
157+
// This struct is a temp struct used by execStart
158+
// Config fields is part of ExecConfig in runconfig package
159+
type ExecStartCheck struct {
160+
// ExecStart will first check if it's detached
161+
Detach bool
162+
// Check if there's a tty
163+
Tty bool
164+
}

‎daemon/daemon.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ type Daemon struct {
118118
func (daemon *Daemon) Install(eng *engine.Engine) error {
119119
for name, method := range map[string]engine.Handler{
120120
"container_inspect": daemon.ContainerInspect,
121-
"execCreate": daemon.ContainerExecCreate,
122-
"execStart": daemon.ContainerExecStart,
123121
} {
124122
if err := eng.Register(name, method); err != nil {
125123
return err

‎daemon/exec.go‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/Sirupsen/logrus"
1111
"github.com/docker/docker/daemon/execdriver"
1212
"github.com/docker/docker/daemon/execdriver/lxc"
13-
"github.com/docker/docker/engine"
1413
"github.com/docker/docker/pkg/broadcastwriter"
1514
"github.com/docker/docker/pkg/ioutils"
1615
"github.com/docker/docker/pkg/promise"
@@ -111,25 +110,15 @@ func (d *Daemon) getActiveContainer(name string) (*Container, error) {
111110
return container, nil
112111
}
113112

114-
func (d *Daemon) ContainerExecCreate(job *engine.Job) error {
115-
if len(job.Args) != 1 {
116-
return fmt.Errorf("Usage: %s [options] container command [args]", job.Name)
117-
}
113+
func (d *Daemon) ContainerExecCreate(config *runconfig.ExecConfig) (string, error) {
118114

119115
if strings.HasPrefix(d.execDriver.Name(), lxc.DriverName) {
120-
return lxc.ErrExec
116+
return "", lxc.ErrExec
121117
}
122118

123-
var name = job.Args[0]
124-
125-
container, err := d.getActiveContainer(name)
119+
container, err := d.getActiveContainer(config.Container)
126120
if err != nil {
127-
return err
128-
}
129-
130-
config, err := runconfig.ExecConfigFromJob(job)
131-
if err != nil {
132-
return err
121+
return "", err
133122
}
134123

135124
cmd := runconfig.NewCommand(config.Cmd...)
@@ -158,20 +147,15 @@ func (d *Daemon) ContainerExecCreate(job *engine.Job) error {
158147

159148
d.registerExecCommand(execConfig)
160149

161-
job.Printf("%s\n", execConfig.ID)
150+
return execConfig.ID, nil
162151

163-
return nil
164152
}
165153

166-
func (d *Daemon) ContainerExecStart(job *engine.Job) error {
167-
if len(job.Args) != 1 {
168-
return fmt.Errorf("Usage: %s [options] exec", job.Name)
169-
}
154+
func (d *Daemon) ContainerExecStart(execName string, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer) error {
170155

171156
var (
172157
cStdin io.ReadCloser
173158
cStdout, cStderr io.Writer
174-
execName = job.Args[0]
175159
)
176160

177161
execConfig, err := d.getExecConfig(execName)
@@ -201,15 +185,15 @@ func (d *Daemon) ContainerExecStart(job *engine.Job) error {
201185
go func() {
202186
defer w.Close()
203187
defer logrus.Debugf("Closing buffered stdin pipe")
204-
io.Copy(w, job.Stdin)
188+
io.Copy(w, stdin)
205189
}()
206190
cStdin = r
207191
}
208192
if execConfig.OpenStdout {
209-
cStdout = job.Stdout
193+
cStdout = stdout
210194
}
211195
if execConfig.OpenStderr {
212-
cStderr = job.Stderr
196+
cStderr = stderr
213197
}
214198

215199
execConfig.StreamConfig.stderr = broadcastwriter.New()

‎runconfig/exec.go‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package runconfig
22

33
import (
4-
"fmt"
5-
6-
"github.com/docker/docker/engine"
74
flag "github.com/docker/docker/pkg/mflag"
85
)
96

@@ -19,25 +16,6 @@ type ExecConfig struct {
1916
Cmd []string
2017
}
2118

22-
func ExecConfigFromJob(job *engine.Job) (*ExecConfig, error) {
23-
execConfig := &ExecConfig{
24-
User: job.Getenv("User"),
25-
Privileged: job.GetenvBool("Privileged"),
26-
Tty: job.GetenvBool("Tty"),
27-
AttachStdin: job.GetenvBool("AttachStdin"),
28-
AttachStderr: job.GetenvBool("AttachStderr"),
29-
AttachStdout: job.GetenvBool("AttachStdout"),
30-
}
31-
cmd := job.GetenvList("Cmd")
32-
if len(cmd) == 0 {
33-
return nil, fmt.Errorf("No exec command specified")
34-
}
35-
36-
execConfig.Cmd = cmd
37-
38-
return execConfig, nil
39-
}
40-
4119
func ParseExec(cmd *flag.FlagSet, args []string) (*ExecConfig, error) {
4220
var (
4321
flStdin = cmd.Bool([]string{"i", "-interactive"}, false, "Keep STDIN open even if not attached")

0 commit comments

Comments
 (0)