finally, we could remove the todo line for start API

//TODO: remove the tty stream in StartPod API, now we could support attach after created
//Done.

Signed-off-by: Wang Xu <gnawux@gmail.com>

Author: gnawux

client/api/start.go

@@ -1,40 +1,17 @@
 package api
 
 import (
-	"fmt"
 	"net/url"
-
-	"github.com/hyperhq/hyperd/engine"
-	"github.com/hyperhq/runv/hypervisor/types"
 )
 
 func (cli *Client) StartPod(podId string) error {
 	v := url.Values{}
 	v.Set("podId", podId)
 
-	body, _, err := readBody(cli.call("POST", "/pod/start?"+v.Encode(), nil, nil))
-	if err != nil {
-		return err
-	}
-	out := engine.NewOutput()
-	remoteInfo, err := out.AddEnv()
+	_, _, err := readBody(cli.call("POST", "/pod/start?"+v.Encode(), nil, nil))
 	if err != nil {
 		return err
 	}
-
-	if _, err := out.Write(body); err != nil {
-		return fmt.Errorf("Error reading remote info: %s", err)
-	}
-	out.Close()
-	errCode := remoteInfo.GetInt("Code")
-	if errCode != types.E_OK {
-		if errCode != types.E_BAD_REQUEST &&
-			errCode != types.E_FAILED {
-			return fmt.Errorf("Error code is %d", errCode)
-		} else {
-			return fmt.Errorf("Cause is %s", remoteInfo.Get("Cause"))
-		}
-	}
 	return nil
 }
 

daemon/daemonbuilder/pod.go

@@ -190,7 +190,7 @@ func (d Docker) ContainerStart(cId string, hostConfig *containertypes.HostConfig
 		}
 	}()
 
-	if _, _, err = d.Daemon.StartPod(nil, nil, podId, false); err != nil {
+	if err = d.Daemon.StartPod(podId); err != nil {
 		return
 	}
 

daemon/run.go

@@ -2,7 +2,6 @@ package daemon
 
 import (
 	"fmt"
-	"io"
 
 	"github.com/golang/glog"
 
@@ -43,39 +42,21 @@ func (daemon *Daemon) CreatePod(podId string, podSpec *apitypes.UserPod) (*pod.X
 	return p, nil
 }
 
-//TODO: remove the tty stream in StartPod API, now we could support attach after created
-func (daemon *Daemon) StartPod(stdin io.ReadCloser, stdout io.WriteCloser, podId string, attach bool) (int, string, error) {
+func (daemon *Daemon) StartPod(podId string) error {
 	p, ok := daemon.PodList.Get(podId)
 	if !ok {
-		return -1, "", fmt.Errorf("The pod(%s) can not be found, please create it first", podId)
-	}
-
-	var waitTty chan error
-
-	if attach {
-		glog.V(1).Info("Run pod with tty attached")
-
-		ids := p.ContainerIdsOf(apitypes.UserContainer_REGULAR)
-		for _, id := range ids {
-			waitTty = make(chan error, 1)
-			p.Attach(id, stdin, stdout, waitTty)
-			break
-		}
+		return fmt.Errorf("The pod(%s) can not be found, please create it first", podId)
 	}
 
 	glog.Infof("Starting pod %q in vm: %q", podId, p.SandboxName())
 
 	err := p.Start()
 	if err != nil {
 		glog.Infof("failed to  start pod %s: %v", p.Id(), err)
-		return -1, err.Error(), err
-	}
-
-	if waitTty != nil {
-		<-waitTty
+		return err
 	}
 
-	return 0, "", err
+	return err
 }
 
 func (daemon *Daemon) WaitContainer(cid string, second int) (int, error) {

daemon/server.go

@@ -239,15 +239,12 @@ func (daemon *Daemon) CmdSetPodLabels(podId string, override bool, labels map[st
 }
 
 func (daemon *Daemon) CmdStartPod(podId string) (*engine.Env, error) {
-	code, cause, err := daemon.StartPod(nil, nil, podId, false)
+	err := daemon.StartPod(podId)
 	if err != nil {
 		return nil, err
 	}
 
 	v := &engine.Env{}
-	v.SetInt("Code", code)
-	v.Set("Cause", cause)
-
 	return v, nil
 }
 

integration/client.go

@@ -453,36 +453,13 @@ func (c *HyperClient) ContainerExecStart(containerId, execId string, stdin io.Re
 }
 
 // StartPod starts a pod by podID
-func (c *HyperClient) StartPod(podID, vmID string, attach bool) error {
-	stream, err := c.client.PodStart(context.Background())
-	if err != nil {
-		return err
-	}
-
-	req := types.PodStartMessage{
-		PodID:  podID,
-		VmID:   vmID,
-		Attach: attach,
-	}
-	if err := stream.Send(&req); err != nil {
-		return err
-	}
-
-	if attach {
-		if _, err := stream.Recv(); err != nil {
-			return err
-		}
-
-		return nil
+func (c *HyperClient) StartPod(podID string) error {
+	req := &types.PodStartRequest{
+		PodID: podID,
 	}
 
-	cmd := types.PodStartMessage{
-		Data: []byte("ls\n"),
-	}
-	if err := stream.Send(&cmd); err != nil {
-		return err
-	}
-	if _, err := stream.Recv(); err != nil {
+	_, err := c.client.PodStart(c.ctx, req)
+	if err != nil {
 		return err
 	}
 

integration/hyper_test.go

@@ -98,7 +98,7 @@ func (s *TestSuite) TestPostAttach(c *C) {
 	c.Logf("Pod created: %s", pod)
 	defer s.client.RemovePod(pod)
 
-	err = s.client.StartPod(pod, "", false)
+	err = s.client.StartPod(pod)
 	c.Assert(err, IsNil)
 
 	podInfo, err := s.client.GetPodInfo(pod)
@@ -154,7 +154,7 @@ func (s *TestSuite) TestCreateAndStartPod(c *C) {
 		c.Errorf("Can't found pod %s", pod)
 	}
 
-	err = s.client.StartPod(pod, "", false)
+	err = s.client.StartPod(pod)
 	c.Assert(err, IsNil)
 
 	podInfo, err := s.client.GetPodInfo(pod)
@@ -296,7 +296,7 @@ func (s *TestSuite) TestAddListDeleteService(c *C) {
 
 	c.Log("    2 ===> create pod")
 
-	err = s.client.StartPod(pod, "", false)
+	err = s.client.StartPod(pod)
 	c.Assert(err, IsNil)
 
 	updateService := []*types.UserService{
@@ -368,7 +368,7 @@ func (s *TestSuite) TestStartAndStopPod(c *C) {
 	c.Assert(err, IsNil)
 	c.Logf("Pod created: %s", pod)
 
-	err = s.client.StartPod(pod, "", false)
+	err = s.client.StartPod(pod)
 	c.Assert(err, IsNil)
 
 	podInfo, err := s.client.GetPodInfo(pod)
@@ -429,7 +429,7 @@ func (s *TestSuite) TestPauseAndUnpausePod(c *C) {
 	c.Assert(err, IsNil)
 	c.Logf("Pod created: %s", pod)
 
-	err = s.client.StartPod(pod, "", false)
+	err = s.client.StartPod(pod)
 	c.Assert(err, IsNil)
 
 	podInfo, err := s.client.GetPodInfo(pod)
@@ -479,7 +479,7 @@ func (s *TestSuite) TestGetPodStats(c *C) {
 		c.Assert(err, IsNil)
 	}()
 
-	err = s.client.StartPod(podID, "", false)
+	err = s.client.StartPod(podID)
 	c.Assert(err, IsNil)
 
 	stats, err := s.client.GetPodStats(podID)

serverrpc/pod.go

@@ -26,68 +26,17 @@ func (s *ServerRPC) PodCreate(ctx context.Context, req *types.PodCreateRequest)
 }
 
 // PodStart starts a pod by podID
-func (s *ServerRPC) PodStart(stream types.PublicAPI_PodStartServer) error {
-	req, err := stream.Recv()
-	if err == io.EOF {
-		return nil
-	}
-	if err != nil {
-		return err
-	}
+func (s *ServerRPC) PodStart(ctx context.Context, req *types.PodStartRequest) (*types.PodStartResponse, error) {
 	glog.V(3).Infof("PodStart with request %s", req.String())
 
-	if !req.Attach {
-		_, _, err := s.daemon.StartPod(nil, nil, req.PodID, req.Attach)
-		if err != nil {
-			glog.Errorf("StartPod failed: %v", err)
-			return err
-		}
-
-		// Send an empty message to client, so client could wait for start complete
-		if err := stream.Send(&types.PodStartMessage{}); err != nil {
-			return err
-		}
-
-		return nil
-	}
-
-	ir, iw := io.Pipe()
-	or, ow := io.Pipe()
+	err := s.daemon.StartPod(req.PodID)
 
-	go func() {
-		for {
-			cmd, err := stream.Recv()
-			if err != nil {
-				return
-			}
-
-			if _, err := iw.Write(cmd.Data); err != nil {
-				return
-			}
-		}
-
-	}()
-
-	go func() {
-		for {
-			res := make([]byte, 512)
-			n, err := or.Read(res)
-			if err != nil {
-				return
-			}
-
-			if err := stream.Send(&types.PodStartMessage{Data: res[:n]}); err != nil {
-				return
-			}
-		}
-	}()
-
-	if _, _, err := s.daemon.StartPod(ir, ow, req.PodID, req.Attach); err != nil {
+	if err != nil {
 		glog.Errorf("StartPod failed: %v", err)
-		return err
+		return nil, err
 	}
 
-	return nil
+	return &types.PodStartResponse{}, nil
 }
 
 // PodRemove removes a pod by podID