From 55a9952b9278226698d18579fb28681773b74565 Mon Sep 17 00:00:00 2001 From: Maxton Huff Date: Mon, 25 Jan 2021 16:19:12 -0600 Subject: [PATCH 1/4] mmap limit comparison error message --- server/server.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/server.go b/server/server.go index 291c986e1..92de59e3e 100644 --- a/server/server.go +++ b/server/server.go @@ -23,11 +23,13 @@ import ( "bytes" "context" "crypto/tls" + "encoding/binary" "io" "log" "math/rand" "net" "os" + "os/exec" "os/signal" "runtime" "strconv" @@ -152,6 +154,12 @@ func (m *Command) Start() (err error) { return errors.Wrap(err, "setting up server") } + cmd, err := exec.Command("sysctl vm.max_map_count").Output() + data := binary.BigEndian.Uint64(cmd) + if m.Config.MaxMapCount >= data { + m.logger.Printf("grpc server error: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, data) + } + // Set up networking (i.e. gossip) err = m.setupNetworking() if err != nil { From 3809fe673440df5c5bbb590b26f19fcd59d2130c Mon Sep 17 00:00:00 2001 From: Maxton Huff Date: Tue, 26 Jan 2021 09:35:51 -0600 Subject: [PATCH 2/4] add error check --- server/server.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/server.go b/server/server.go index 92de59e3e..8ab8402b9 100644 --- a/server/server.go +++ b/server/server.go @@ -24,6 +24,7 @@ import ( "context" "crypto/tls" "encoding/binary" + "fmt" "io" "log" "math/rand" @@ -154,10 +155,14 @@ func (m *Command) Start() (err error) { return errors.Wrap(err, "setting up server") } - cmd, err := exec.Command("sysctl vm.max_map_count").Output() + cmd, err := exec.Command("sysctl", "vm.max_map_count").Output() data := binary.BigEndian.Uint64(cmd) - if m.Config.MaxMapCount >= data { - m.logger.Printf("grpc server error: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, data) + if err != nil { + fmt.Println("Error: ", err) + } else { + if m.Config.MaxMapCount >= data { + m.logger.Printf("grpc server error: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, data) + } } // Set up networking (i.e. gossip) From 3982a8e970fd07edd60dc756b57fa74a50382473 Mon Sep 17 00:00:00 2001 From: Maxton Huff Date: Tue, 26 Jan 2021 11:26:36 -0600 Subject: [PATCH 3/4] format messages and change mmap comparison logic --- server/server.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index 8ab8402b9..ac06bc0fa 100644 --- a/server/server.go +++ b/server/server.go @@ -24,7 +24,6 @@ import ( "context" "crypto/tls" "encoding/binary" - "fmt" "io" "log" "math/rand" @@ -155,13 +154,13 @@ func (m *Command) Start() (err error) { return errors.Wrap(err, "setting up server") } - cmd, err := exec.Command("sysctl", "vm.max_map_count").Output() - data := binary.BigEndian.Uint64(cmd) + result, err := exec.Command("sysctl", "vm.max_map_count").Output() if err != nil { - fmt.Println("Error: ", err) + m.logger.Printf("Tried unsuccessfully to check system mmap limit: %v", err) } else { - if m.Config.MaxMapCount >= data { - m.logger.Printf("grpc server error: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, data) + sysMmapLimit := binary.BigEndian.Uint64(result) + if m.Config.MaxMapCount > sysMmapLimit { + m.logger.Printf("WARNING: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, sysMmapLimit) } } From 927db378b403923a138df1b0fdd4b0ac2b66317e Mon Sep 17 00:00:00 2001 From: Maxton Huff Date: Wed, 27 Jan 2021 09:52:13 -0600 Subject: [PATCH 4/4] add linux OS check and the way mmap limit is read --- lattice | 2 +- server/server.go | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lattice b/lattice index 36f453c1e..28c2313ec 160000 --- a/lattice +++ b/lattice @@ -1 +1 @@ -Subproject commit 36f453c1ea3bf86c546a8ad4a88f2a926724d683 +Subproject commit 28c2313ecfcd7e083d42d4e409483e968b4c421b diff --git a/server/server.go b/server/server.go index ac06bc0fa..530e4102a 100644 --- a/server/server.go +++ b/server/server.go @@ -23,16 +23,16 @@ import ( "bytes" "context" "crypto/tls" - "encoding/binary" "io" + "io/ioutil" "log" "math/rand" "net" "os" - "os/exec" "os/signal" "runtime" "strconv" + "strings" "sync" "syscall" "time" @@ -154,13 +154,17 @@ func (m *Command) Start() (err error) { return errors.Wrap(err, "setting up server") } - result, err := exec.Command("sysctl", "vm.max_map_count").Output() - if err != nil { - m.logger.Printf("Tried unsuccessfully to check system mmap limit: %v", err) - } else { - sysMmapLimit := binary.BigEndian.Uint64(result) - if m.Config.MaxMapCount > sysMmapLimit { - m.logger.Printf("WARNING: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, sysMmapLimit) + if runtime.GOOS == "linux" { + result, err := ioutil.ReadFile("/proc/sys/vm/max_map_count") + if err != nil { + m.logger.Printf("Tried unsuccessfully to check system mmap limit: %v", err) + } else { + sysMmapLimit, err := strconv.ParseUint(strings.TrimSuffix(string(result), "\n"), 10, 64) + if err != nil { + m.logger.Printf("Tried unsuccessfully to check system mmap limit: %v", err) + } else if m.Config.MaxMapCount > sysMmapLimit { + m.logger.Printf("WARNING: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, sysMmapLimit) + } } }