add hard memory limit

Author: tonicmuroq

cluster/calcium/create_container.go

@@ -593,6 +593,7 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
 		}
 	} else {
 		resource = enginecontainer.Resources{
+			Memory:    opts.Memory,
 			CPUPeriod: utils.CpuPeriodBase,
 			CPUQuota:  int64(opts.CPUQuota * float64(utils.CpuPeriodBase)),
 			Ulimits:   ulimits,

cluster/calcium/remove_container.go

@@ -104,8 +104,8 @@ func (c *calcium) removeOneContainer(container *types.Container) error {
 
 	// if total cpu of container > 0, then we need to release these core resource
 	// but if it's 0, just ignore to save 1 time write on etcd.
-	log.WithFields(log.Fields{"nodename": node.Name, "cpumap": container.CPU}).Debugln("Restore node CPU:")
 	if container.CPU.Total() > 0 {
+		log.WithFields(log.Fields{"nodename": node.Name, "cpumap": container.CPU}).Debugln("Restore node CPU:")
 		if err := c.store.UpdateNodeCPU(node.Podname, node.Name, container.CPU, "+"); err != nil {
 			return err
 		}

devtools/client.py

@@ -210,6 +210,7 @@ def create_container(ctx):
                             entrypoint='web',
                             cpu_quota=1,
                             count=2,
+                            memory=0,
                             networks={'zzz': ''}, # 如果不需要指定IP就写空字符串, 写其他的错误的格式会报错失败
                             env=['ENV_A=1', 'ENV_B=2'])