Merge pull request #2058 from stevvooe/cherry-pick-#2055

crosbymichael · web-flow · commit 3f98e5d0fc27 · 2018-01-25T10:10:34.000-05:00
[release/1.0] cmd/containerd-shim: aggressive memory reclamation
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -12,9 +12,11 @@ import (
 	"os/exec"
 	"os/signal"
 	"runtime"
+	"runtime/debug"
 	"strings"
 	"sync"
 	"syscall"
+	"time"
 
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/linux/proc"
@@ -58,6 +60,13 @@ func init() {
 }
 
 func main() {
+	debug.SetGCPercent(10)
+	go func() {
+		for range time.Tick(30 * time.Second) {
+			debug.FreeOSMemory()
+		}
+	}()
+
 	if debugFlag {
 		logrus.SetLevel(logrus.DebugLevel)
 	}
