Merge pull request #2091 from crosbymichael/shim-size

Shim optimizations for size and cpu

cmd/containerd-shim/main_unix.go

@@ -60,7 +60,7 @@ func init() {
 }
 
 func main() {
-	debug.SetGCPercent(10)
+	debug.SetGCPercent(40)
 	go func() {
 		for range time.Tick(30 * time.Second) {
 			debug.FreeOSMemory()

linux/proc/types.go

@@ -1,16 +1,23 @@
 package proc
 
 import (
-	containerd_types "github.com/containerd/containerd/api/types"
 	google_protobuf "github.com/gogo/protobuf/types"
 )
 
+// Mount holds filesystem mount configuration
+type Mount struct {
+	Type    string
+	Source  string
+	Target  string
+	Options []string
+}
+
 // CreateConfig hold task creation configuration
 type CreateConfig struct {
 	ID               string
 	Bundle           string
 	Runtime          string
-	Rootfs           []*containerd_types.Mount
+	Rootfs           []Mount
 	Terminal         bool
 	Stdin            string
 	Stdout           string

linux/shim/service.go

@@ -95,6 +95,16 @@ type Service struct {
 func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (*shimapi.CreateTaskResponse, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
+
+	var mounts []proc.Mount
+	for _, m := range r.Rootfs {
+		mounts = append(mounts, proc.Mount{
+			Type:    m.Type,
+			Source:  m.Source,
+			Target:  m.Target,
+			Options: m.Options,
+		})
+	}
 	process, err := proc.New(
 		ctx,
 		s.config.Path,
@@ -108,7 +118,7 @@ func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (*sh
 			ID:               r.ID,
 			Bundle:           r.Bundle,
 			Runtime:          r.Runtime,
-			Rootfs:           r.Rootfs,
+			Rootfs:           mounts,
 			Terminal:         r.Terminal,
 			Stdin:            r.Stdin,
 			Stdout:           r.Stdout,

log/grpc.go

@@ -1,12 +0,0 @@
-package log
-
-import (
-	"io/ioutil"
-	"log"
-
-	"google.golang.org/grpc/grpclog"
-)
-
-func init() {
-	grpclog.SetLogger(log.New(ioutil.Discard, "", log.LstdFlags))
-}