Merge pull request #726 from darkowlzz/add-pidsLimit

api.proto: Add pidsLimit
gojoy · Apr 14, 2017 · a47bf53 · a47bf53
2 parents 0890045 + 91525bf
commit a47bf53
Show file tree

Hide file tree

Showing 6 changed files with 192 additions and 171 deletions.
diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go
@@ -290,6 +290,9 @@ func (s *apiServer) UpdateContainer(ctx context.Context, r *types.UpdateContaine
 		if rs.MemorySwap != 0 {
 			e.Resources.MemorySwap = int64(rs.MemorySwap)
 		}
+		if rs.PidsLimit != 0 {
+			e.Resources.PidsLimit = int64(rs.PidsLimit)
+		}
 	}
 	s.sv.SendTask(e)
 	if err := <-e.ErrorCh(); err != nil {

diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go
diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto
@@ -210,6 +210,7 @@ message UpdateResource {
 	repeated ThrottleDevice blkioThrottleWriteBpsDevice = 15;
 	repeated ThrottleDevice blkioThrottleReadIopsDevice = 16;
 	repeated ThrottleDevice blkioThrottleWriteIopsDevice = 17;
+	uint64 pidsLimit = 18;
 }
 
 message BlockIODevice {

diff --git a/ctr/container.go b/ctr/container.go
@@ -627,6 +627,9 @@ var updateCommand = cli.Command{
 		cli.StringFlag{
 			Name: "cpuset-mems",
 		},
+		cli.StringFlag{
+			Name: "pids-limit",
+		},
 	},
 	Action: func(context *cli.Context) {
 		req := &types.UpdateContainerRequest{
@@ -644,6 +647,7 @@ var updateCommand = cli.Command{
 		req.Resources.CpusetMems = context.String("cpuset-mems")
 		req.Resources.KernelMemoryLimit = getUpdateCommandInt64Flag(context, "kernel-limit")
 		req.Resources.KernelTCPMemoryLimit = getUpdateCommandInt64Flag(context, "kernel-tcp-limit")
+		req.Resources.PidsLimit = getUpdateCommandInt64Flag(context, "pids-limit")
 		c := getClient(context)
 		if _, err := c.UpdateContainer(netcontext.Background(), req); err != nil {
 			fatal(err.Error(), 1)

diff --git a/runtime/container_linux.go b/runtime/container_linux.go
@@ -127,6 +127,9 @@ func (c *container) UpdateResources(r *Resource) error {
 		BlockIO: &ocs.BlockIO{
 			Weight: &r.BlkioWeight,
 		},
+		Pids: &ocs.Pids{
+			Limit: &r.PidsLimit,
+		},
 	}
 
 	srStr := bytes.NewBuffer(nil)

diff --git a/runtime/runtime.go b/runtime/runtime.go
@@ -95,6 +95,7 @@ type Resource struct {
 	Memory            int64
 	MemoryReservation int64
 	MemorySwap        int64
+	PidsLimit         int64
 }
 
 // Possible container states