Merge pull request #6720 from stgraber/master

Pre-release bugfixes
canonical · Jan 15, 2020 · f9adc00 · f9adc00
2 parents 0a5afff + 6edc4b2
commit f9adc00
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/lxd/cgroup/abstraction.go b/lxd/cgroup/abstraction.go
@@ -50,14 +50,8 @@ func (cg *CGroup) SetMemorySoftLimit(softLim string) error {
 	case Unavailable:
 		return ErrControllerMissing
 	case V1:
-		if softLim == "-1" {
-			return cg.rw.Set(version, "memory", "memory.soft_limit_in_bytes", "max")
-		}
 		return cg.rw.Set(version, "memory", "memory.soft_limit_in_bytes", softLim)
 	case V2:
-		if softLim == "-1" {
-			return cg.rw.Set(version, "memory", "memory.low", "max")
-		}
 		return cg.rw.Set(version, "memory", "memory.low", softLim)
 	}
 
@@ -129,15 +123,8 @@ func (cg *CGroup) SetMemorySwapMax(max string) error {
 	case Unavailable:
 		return ErrControllerMissing
 	case V1:
-		if max == "-1" {
-			return cg.rw.Set(version, "memory", "memory.memsw.limit_in_bytes", "max")
-		}
-
 		return cg.rw.Set(version, "memory", "memory.memsw.limit_in_bytes", max)
 	case V2:
-		if max == "-1" {
-			return cg.rw.Set(version, "memory", "memory.swap.max", "max")
-		}
 		return cg.rw.Set(version, "memory", "memory.swap.max", max)
 
 	}

diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
@@ -4112,7 +4112,7 @@ func (c *containerLXC) Update(args db.InstanceArgs, userRequested bool) error {
 		return errors.Wrap(err, "Initialize LXC")
 	}
 
-	cg, err := c.cgroup(c.c)
+	cg, err := c.cgroup(nil)
 	if err != nil {
 		return err
 	}
@@ -4317,11 +4317,13 @@ func (c *containerLXC) Update(args db.InstanceArgs, userRequested bool) error {
 						return err
 					}
 				}
+
 				err = cg.SetMemoryMaxUsage("-1")
 				if err != nil {
 					revertMemory()
 					return err
 				}
+
 				err = cg.SetMemorySoftLimit("-1")
 				if err != nil {
 					revertMemory()
@@ -4343,6 +4345,7 @@ func (c *containerLXC) Update(args db.InstanceArgs, userRequested bool) error {
 							revertMemory()
 							return err
 						}
+
 						err = cg.SetMemorySwapMax(memory)
 						if err != nil {
 							revertMemory()
@@ -4362,6 +4365,7 @@ func (c *containerLXC) Update(args db.InstanceArgs, userRequested bool) error {
 						revertMemory()
 						return err
 					}
+
 					err = cg.SetMemorySoftLimit(fmt.Sprintf("%.0f", float64(valueInt)*0.9))
 					if err != nil {
 						revertMemory()
@@ -5756,7 +5760,7 @@ func (c *containerLXC) cpuState() api.InstanceStateCPU {
 	cpu := api.InstanceStateCPU{}
 
 	// CPU usage in seconds
-	cg, err := c.cgroup(c.c)
+	cg, err := c.cgroup(nil)
 	if err != nil {
 		return cpu
 	}
@@ -5832,7 +5836,7 @@ func (c *containerLXC) diskState() map[string]api.InstanceStateDisk {
 
 func (c *containerLXC) memoryState() api.InstanceStateMemory {
 	memory := api.InstanceStateMemory{}
-	cg, err := c.cgroup(c.c)
+	cg, err := c.cgroup(nil)
 	if err != nil {
 		return memory
 	}
@@ -5945,7 +5949,7 @@ func (c *containerLXC) processesState() int64 {
 		return 0
 	}
 
-	cg, err := c.cgroup(c.c)
+	cg, err := c.cgroup(nil)
 	if err != nil {
 		return 0
 	}
@@ -6525,7 +6529,7 @@ func (c *containerLXC) removeDiskDevices() error {
 
 // Network I/O limits
 func (c *containerLXC) setNetworkPriority() error {
-	cg, err := c.cgroup(c.c)
+	cg, err := c.cgroup(nil)
 	if err != nil {
 		return err
 	}

diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go
@@ -315,7 +315,7 @@ func (d *btrfs) Mount() (bool, error) {
 		}
 
 		// Custom mount options don't work inside containers
-		if !d.state.OS.RunningInUserNS {
+		if d.state.OS.RunningInUserNS {
 			return true, nil
 		}