add grpc api of container signal

Signed-off-by: haozhang <crazykev@zju.edu.cn>

Author: Crazykev

integration/client.go

@@ -735,3 +735,17 @@ func (c *HyperClient) Ping() (*types.PingResponse, error) {
 
 	return resp, nil
 }
+
+// ContainerSignal sends a signal to specified container of specified pod
+func (c *HyperClient) ContainerSignal(podID, containerID string, signal int64) error {
+	_, err := c.client.ContainerSignal(c.ctx, &types.ContainerSignalRequest{
+		PodID:       podID,
+		ContainerID: containerID,
+		Signal:      signal,
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

integration/hyper_test.go

@@ -494,3 +494,41 @@ func (s *TestSuite) TestPing(c *C) {
 	c.Assert(err, IsNil)
 	c.Logf("Got HyperdStats %v", resp)
 }
+
+func (s *TestSuite) TestSendContainerSignal(c *C) {
+	sigKill := int64(9)
+	spec := types.UserPod{
+		Id: "busybox",
+	}
+
+	pod, err := s.client.CreatePod(&spec)
+	c.Assert(err, IsNil)
+	c.Logf("Pod created: %s", pod)
+
+	defer func() {
+		err = s.client.RemovePod(pod)
+		c.Assert(err, IsNil)
+	}()
+
+	container, err := s.client.CreateContainer(pod, &types.UserContainer{Image: "busybox"})
+	c.Assert(err, IsNil)
+	c.Logf("Container created: %s", container)
+
+	err = s.client.StartPod(pod, "", false)
+	c.Assert(err, IsNil)
+
+	containerInfo, err := s.client.GetContainerInfo(container)
+	c.Assert(err, IsNil)
+	c.Assert(containerInfo.Status.Phase, Equals, "running")
+
+	err = s.client.ContainerSignal(pod, container, sigKill)
+	c.Assert(err, IsNil)
+
+	exitCode, err := s.client.Wait(container, "", false)
+	c.Assert(err, IsNil)
+	c.Assert(exitCode, Equals, int32(137))
+
+	containerInfo, err = s.client.GetContainerInfo(container)
+	c.Assert(err, IsNil)
+	c.Assert(containerInfo.Status.Phase, Equals, "failed")
+}

serverrpc/container.go

@@ -66,3 +66,16 @@ func (s *ServerRPC) ContainerRemove(ctx context.Context, req *types.ContainerRem
 	}
 	return &types.ContainerRemoveResponse{}, nil
 }
+
+// ContainerSignal sends a singal to specified container of specified pod
+func (s *ServerRPC) ContainerSignal(ctx context.Context, req *types.ContainerSignalRequest) (*types.ContainerSignalResponse, error) {
+	glog.V(3).Infof("ContainerSignal with request %s", req.String())
+
+	err := s.daemon.KillPodContainers(req.PodID, req.ContainerID, req.Signal)
+	if err != nil {
+		glog.Errorf("Kill Container %s of Pod %s with signal %d failed: %v", req.ContainerID, req.PodID, req.Signal, err)
+		return nil, err
+	}
+
+	return &types.ContainerSignalResponse{}, nil
+}

types/types.pb.go

@@ -759,6 +759,14 @@ message PingResponse {
   string hyperdStats = 1;
 }
 
+message ContainerSignalRequest {
+    string podID       = 1;
+    string containerID = 2;
+    int64  signal      = 3;
+}
+
+message ContainerSignalResponse{}
+
 // PublicAPI defines the public APIs which are handled over TCP sockets.
 service PublicAPI {
     // PodList gets a list of pods
@@ -773,7 +781,7 @@ service PublicAPI {
     rpc PodStart(stream PodStartMessage) returns (stream PodStartMessage) {}
     // PodStop stops a pod
     rpc PodStop(PodStopRequest) returns (PodStopResponse) {}
-    // PodSignal sends a singal to all containers of specified pod
+    // PodSignal sends a signal to all containers of specified pod
     rpc PodSignal(PodSignalRequest) returns (PodSignalResponse) {}
     // PodPause pauses a pod
     rpc PodPause(PodPauseRequest) returns (PodPauseResponse) {}
@@ -806,7 +814,8 @@ service PublicAPI {
     // ContainerRename renames a container
     rpc ContainerRename(ContainerRenameRequest) returns (ContainerRenameResponse) {}
     // TODO: ContainerCommit commits the changes of the specified container
-    // TODO: ContainerSignal sends a singla to specified container
+    // ContainerSignal sends a signal to specified container
+    rpc ContainerSignal(ContainerSignalRequest) returns (ContainerSignalResponse) {}
     // TODO: ContainerLabels updates labels of the specified container
     // ContainerStop stops the specified container
     rpc ContainerStop(ContainerStopRequest) returns (ContainerStopResponse) {}