kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Allow for larger preset property values, do not override

Browse source 
Signed-off-by: Jim Carroll <jim.carroll@docker.com>
This commit is contained in:
Jim Carroll 2018-03-22 17:30:14 -05:00
parent e21dab839d
commit bab08251c0
1 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
libnetwork/drivers/overlay/ostweaks_linux.go
View file

@ -3,15 +3,36 @@ package overlay
import ( import (
"io/ioutil" "io/ioutil"
"path" "path"
"strconv"
"strings" "strings"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
var sysctlConf = map[string]string{ type conditionalCheck func(val1, val2 string) bool
"net.ipv4.neigh.default.gc_thresh1": "8192",
"net.ipv4.neigh.default.gc_thresh2": "49152", type osValue struct {
"net.ipv4.neigh.default.gc_thresh3": "65536", value string
checkFn conditionalCheck
}
var osConfig = map[string]osValue{
"net.ipv4.neigh.default.gc_thresh1": {"8192", checkHigher},
"net.ipv4.neigh.default.gc_thresh2": {"49152", checkHigher},
"net.ipv4.neigh.default.gc_thresh3": {"65536", checkHigher},
}
func propertyIsValid(val1, val2 string, check conditionalCheck) bool {
if check == nil || check(val1, val2) {
return true
}
return false
}
func checkHigher(val1, val2 string) bool {
val1Int, _ := strconv.ParseInt(val1, 10, 32)
val2Int, _ := strconv.ParseInt(val2, 10, 32)
return val1Int < val2Int
} }
// writeSystemProperty writes the value to a path under /proc/sys as determined from the key. // writeSystemProperty writes the value to a path under /proc/sys as determined from the key.
@ -21,10 +42,31 @@ func writeSystemProperty(key, value string) error {
return ioutil.WriteFile(path.Join("/proc/sys", keyPath), []byte(value), 0644) return ioutil.WriteFile(path.Join("/proc/sys", keyPath), []byte(value), 0644)
} }
func readSystemProperty(key string) (string, error) {
keyPath := strings.Replace(key, ".", "/", -1)
value, err := ioutil.ReadFile(path.Join("/proc/sys", keyPath))
if err != nil {
return "", err
}
return string(value), nil
}
func applyOStweaks() { func applyOStweaks() {
for k, v := range sysctlConf { for k, v := range osConfig {
if err := writeSystemProperty(k, v); err != nil { // read the existing property from disk
logrus.Errorf("error setting the kernel parameter %s = %s, err: %s", k, v, err) oldv, err := readSystemProperty(k)
if err != nil {
logrus.Errorf("error reading the kernel parameter %s, error: %s", k, err)
continue
}
if propertyIsValid(oldv, v.value, v.checkFn) {
// write new prop value to disk
if err := writeSystemProperty(k, v.value); err != nil {
logrus.Errorf("error setting the kernel parameter %s = %s, (leaving as %s) error: %s", k, v.value, oldv, err)
continue
}
logrus.Debugf("updated kernel parameter %s = %s (was %s)", k, v.value, oldv)
} }
} }
} }