Merge pull request #24 from csivitu/dev

merge dev

Author: alias-rahil

examples/worker.ts

@@ -2,9 +2,9 @@ import { Worker, languages } from '../src/CodeExecutor';
 import logger from '../src/utils/logger';
 
 /**
-  * name, redis, folderPath, default folderPath is /tmp/code-exec
-  * (folderPath will be mounted in container,
-  * the code and testcases will be saved here)
+  * name, redis, folderPath ( path to mount, default /tmp/code-exec ),
+  * memory (in MB, default 0, ie no limit),
+  * CPUs (no. of CPUs, default 0.5)
 */
 const worker = new Worker('myExecutor', 'redis://127.0.0.1:6379');
 

src/Runner.ts

@@ -22,6 +22,8 @@ interface RunnerOpts {
     folderPath: string;
     language: string;
     timeout: number;
+    memory: number;
+    CPUs: number;
 }
 export default class Runner {
     private docker: Docker;
@@ -39,12 +41,18 @@ export default class Runner {
         folderPath,
         language,
         timeout,
+        memory,
+        CPUs,
     }: RunnerOpts): Promise < Result > {
         const Paths = await saveCode(folderPath, code, testCases, base64, language);
         const promisesToKeep: Array<Promise<Array<object>>> = [];
         for (let i = 0; i < Paths.length; i += 1) {
             promisesToKeep.push(this.docker.run(tag, ['bash', '/start.sh', `${i}`, `${timeout}`], null, {
                 HostConfig: {
+                    CpuPeriod: 100000,
+                    CpuQuota: CPUs * 100000,
+                    Memory: memory,
+                    NetworkMode: 'none',
                     AutoRemove: true,
                     Mounts: [{
                         Source: Paths[i],

src/Worker.ts

@@ -18,12 +18,18 @@ export default class Worker {
 
     private folderPath?: string;
 
-    constructor(name: string, redis: string, folderPath?: string) {
+    private memory?: number;
+
+    private CPUs?: number;
+
+    constructor(name: string, redis: string, folderPath?: string, memory?: number, CPUs?: number) {
         this.docker = new Docker();
         this.runner = new Runner(this.docker);
         this.builder = new Builder(this.docker);
         this.queue = new Bull(name, redis);
         this.folderPath = folderPath || '/tmp/code-exec';
+        this.memory = (memory || 0) * 1000000;
+        this.CPUs = CPUs || 0.5;
     }
 
     private async work(codeOptions: Code): Promise<Result> {
@@ -38,6 +44,8 @@ export default class Worker {
             base64: codeOptions.base64 || false,
             language: codeOptions.language,
             timeout: codeOptions.timeout,
+            memory: this.memory,
+            CPUs: this.CPUs,
         });
 
         return result;