feat(memory): add ability to limit memory (RAM) limit per job

bleenco · Sep 21, 2017 · 9d4f01e · 9d4f01e
1 parent 98915f7
commit 9d4f01e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/src/api/config.ts b/src/api/config.ts
@@ -3,15 +3,6 @@ import { readdir, readFile } from 'fs';
 import * as yaml from 'yamljs';
 import * as temp from 'temp';
 
-export enum CacheType {
-  bundler,
-  yarn,
-  pip,
-  ccache,
-  packages,
-  cargo
-}
-
 export enum CommandType {
   git = 'git',
   before_install = 'before_install',

diff --git a/src/api/docker.ts b/src/api/docker.ts
@@ -14,7 +14,8 @@ export const docker = new dockerode();
 export function createContainer(
   name: string,
   image: string,
-  envs?: string[]
+  envs: string[],
+  memoryLimitPerJob: number
 ): Observable<ProcessOutput> {
   return new Observable(observer => {
     docker.createContainer({
@@ -33,6 +34,9 @@ export function createContainer(
       PortBindings: {
         '22/tcp': [{ HostPort: '' }],
         '5900/tcp': [{ HostPort: '' }]
+      },
+      HostConfig: {
+        Memory: memoryLimitPerJob * 1024 * 1024
       }
     } as any)
     .then(container => container.start())
@@ -241,16 +245,19 @@ export function getContainersStats(): Observable<any> {
                   let rawJson = json + buf.toString();
                   try {
                     let data = JSON.parse(rawJson);
-                    const stats = {
-                      id: container.Id,
-                      name: container.Names[0].substr(1) || '',
-                      cpu: getCpuData(data),
-                      network: getNetworkData(data),
-                      memory: getMemory(data)
-                    };
 
-                    stream.destroy();
-                    resolve(stats);
+                    if (data && data.precpu_stats.system_cpu_usage) {
+                      const stats = {
+                        id: container.Id,
+                        name: container.Names[0].substr(1) || '',
+                        cpu: getCpuData(data),
+                        network: getNetworkData(data),
+                        memory: getMemory(data)
+                      };
+
+                      stream.destroy();
+                      resolve(stats);
+                    }
                   } catch (e) {
                     json = rawJson;
                   }
@@ -271,6 +278,7 @@ function getCpuData(json: any): { usage: string, cores: number } {
   const total = preCpuStats.cpu_usage.total_usage - postCpuStats.cpu_usage.total_usage;
   const curr = preCpuStats.system_cpu_usage - postCpuStats.system_cpu_usage;
   const perc = isNaN(total / (total + curr) * 100) ? 0 : total / (total + curr) * 100;
+
   return {
     usage: perc.toFixed(2) + '%',
     cores: postCpuStats.online_cpus

diff --git a/src/api/process-manager.ts b/src/api/process-manager.ts
@@ -208,7 +208,9 @@ export function startJob(proc: JobProcess): Promise<void> {
 
       const jobTimeout = config.jobTimeout ? config.jobTimeout * 1000 : 3600000;
       const idleTimeout = config.idleTimeout ? config.idleTimeout * 1000 : 3600000;
-      startBuildProcess(proc, envVariables, jobTimeout, idleTimeout)
+      const memoryLimitPerJob = config.memoryLimitPerJob || 1024;
+
+      startBuildProcess(proc, envVariables, jobTimeout, idleTimeout, memoryLimitPerJob)
         .subscribe(event => {
           const msg: JobProcessEvent = {
             build_id: proc.build_id,

diff --git a/src/api/process.ts b/src/api/process.ts
@@ -30,7 +30,8 @@ export function startBuildProcess(
   proc: JobProcess,
   variables: string[],
   jobTimeout: number,
-  idleTimeout: number
+  idleTimeout: number,
+  memoryLimitPerJob: number
 ): Observable<ProcessOutput> {
   return new Observable(observer => {
     const image = proc.image_name;
@@ -99,7 +100,7 @@ export function startBuildProcess(
       ]);
     }
 
-    const sub = docker.createContainer(name, image, envs)
+    const sub = docker.createContainer(name, image, envs, memoryLimitPerJob)
       .concat(...gitCommands.map(cmd => docker.attachExec(name, cmd)))
       .concat(restoreCache)
       .concat(...installCommands.map(cmd => docker.attachExec(name, cmd)))

diff --git a/src/api/utils.ts b/src/api/utils.ts
@@ -26,6 +26,7 @@ const defaultConfig = {
   concurrency: 10,
   idleTimeout: 600,
   jobTimeout: 3600,
+  memoryLimitPerJob: 2048,
   ssl: false,
   sslcert: null,
   sslkey: null,