api.proto: Add pidsLimit

darkowlzz · darkowlzz · commit 91525bfcaef2 · 2017-04-13T21:16:44.000Z
pidsLimit is required to enable updating PidsLimit of containers.
Also, updated runtime Resources, UpdateResources and ctr with pidsLimit.

Signed-off-by: Sunny Gogoi &lt;indiasuny000@gmail.com&gt;
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

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,9 @@ func (s apiServer) UpdateContainer(ctx context.Context, r types.UpdateContaine`
`290`	`290`	`if rs.MemorySwap != 0 {`
`291`	`291`	`e.Resources.MemorySwap = int64(rs.MemorySwap)`
`292`	`292`	`}`
	`293`	`+ if rs.PidsLimit != 0 {`
	`294`	`+ e.Resources.PidsLimit = int64(rs.PidsLimit)`
	`295`	`+ }`
`293`	`296`	`}`
`294`	`297`	`s.sv.SendTask(e)`
`295`	`298`	`if err := <-e.ErrorCh(); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ message UpdateResource {`
`210`	`210`	`repeated ThrottleDevice blkioThrottleWriteBpsDevice = 15;`
`211`	`211`	`repeated ThrottleDevice blkioThrottleReadIopsDevice = 16;`
`212`	`212`	`repeated ThrottleDevice blkioThrottleWriteIopsDevice = 17;`
	`213`	`+ uint64 pidsLimit = 18;`
`213`	`214`	`}`
`214`	`215`
`215`	`216`	`message BlockIODevice {`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,9 @@ func (c container) UpdateResources(r Resource) error {`
`127`	`127`	`BlockIO: &ocs.BlockIO{`
`128`	`128`	`Weight: &r.BlkioWeight,`
`129`	`129`	`},`
	`130`	`+ Pids: &ocs.Pids{`
	`131`	`+ Limit: &r.PidsLimit,`
	`132`	`+ },`
`130`	`133`	`}`
`131`	`134`
`132`	`135`	`srStr := bytes.NewBuffer(nil)`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ type Resource struct {`
`95`	`95`	`Memory int64`
`96`	`96`	`MemoryReservation int64`
`97`	`97`	`MemorySwap int64`
	`98`	`+ PidsLimit int64`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`// Possible container states`