alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fn: headroom error case to clarify OOM (#589)

Browse Source
This commit is contained in:
Tolga Ceylan
2017-12-12 12:02:12 -08:00
committed by GitHub
parent 669b8ef662
commit b0937f236f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/agent/resource.go
View File

@@ -216,7 +216,10 @@ func (a *resourceTracker) initializeMemory() {
} }
// clamp the available memory by head room (for docker, ourselves, other processes) // clamp the available memory by head room (for docker, ourselves, other processes)
headRoom := getMemoryHeadRoom(availMemory) headRoom, err := getMemoryHeadRoom(availMemory)
if err != nil {
logrus.WithError(err).Fatal("Out of memory")
}
availMemory = availMemory - headRoom availMemory = availMemory - headRoom
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
@@ -255,7 +258,7 @@ func (a *resourceTracker) initializeMemory() {
} }
// headroom estimation in order not to consume entire RAM if possible // headroom estimation in order not to consume entire RAM if possible
func getMemoryHeadRoom(usableMemory uint64) uint64 { func getMemoryHeadRoom(usableMemory uint64) (uint64, error) {
// get %10 of the RAM // get %10 of the RAM
headRoom := uint64(usableMemory / 10) headRoom := uint64(usableMemory / 10)
@@ -263,10 +266,13 @@ func getMemoryHeadRoom(usableMemory uint64) uint64 {
// clamp this with 256MB min -- 5GB max // clamp this with 256MB min -- 5GB max
maxHeadRoom := uint64(5 * 1024 * 1024 * 1024) maxHeadRoom := uint64(5 * 1024 * 1024 * 1024)
minHeadRoom := uint64(256 * 1024 * 1024) minHeadRoom := uint64(256 * 1024 * 1024)
minHeadRoom = minUint64(minHeadRoom, usableMemory)
if minHeadRoom >= usableMemory {
return 0, fmt.Errorf("Not enough memory: %v", usableMemory)
}
headRoom = clampUint64(headRoom, minHeadRoom, maxHeadRoom) headRoom = clampUint64(headRoom, minHeadRoom, maxHeadRoom)
return headRoom return headRoom, nil
} }
func checkCgroup() (uint64, error) { func checkCgroup() (uint64, error) {