Commit: b459f117df9e712ec738f76339191854a7ff9a63 - dogrun-ci (git)

docker based ci tool

Commit MetaInfo

• Revisão: b459f117df9e712ec738f76339191854a7ff9a63 (tree)
• Hora: 2019-05-31 03:41:46
• Autor: hylom <hylom@user...>
• Commiter: hylom

Mensagem de Log

core-server: use separate thread to run and watch container

Mudança Sumário

• modified: core-server/server.py

Diff

--- a/core-server/server.py
+++ b/core-server/server.py
@@ -4,6 +4,9 @@ import os
 import re
 import pathlib
 import time
+import concurrent.futures
+import json
+
 import grpc
 from concurrent import futures
 
@@ -19,18 +22,63 @@ _ONE_DAY_IN_SECONDS = 60 * 60 * 24
 
 OUTPUT_DIR = './results'
 
+executor = concurrent.futures.ThreadPoolExecutor(max_workers=2)
+
+def run_task(task_name, task):
+    print("run task: '{}'".format(task_name))
+
+    status = {
+        "succeeded": False,
+        "container_status": "Running"
+    };
+    reporter = FileReporter(task_name, status)
+    reporter.write_status()
+
+    image = task["image"]
+    client = docker.from_env()
+    container = client.containers.run(image=image, detach=True)
+    container.wait(timeout=task.get("timeout", 60))
+
+    print("task done.")
+
+    lines = []
+    for line in container.logs(stream=True):
+        lines.append(line)
+        logs = b"".join(lines)
+
+    if task.get("auto_remove", True):
+        container.remove()
+        print("container removed.")
+
+    reporter.set_log(logs)
+    status["container_status"] = "Done"
+    reporter.write_status()
+    reporter.write_log()
+
+    print("done.")
+    return
+
+
 class FileReporter():
-    def __init__(self, task_name, report, logs):
+    def __init__(self, task_name, status, log=None):
         self.task_name = task_name
-        self.report = report
-        self.logs = logs
+        self.status = status
+        self.log = log
         self.output_basedir = os.path.join(OUTPUT_DIR, task_name)
+        self.output_dir = self._get_output_directory()
+
+    def set_log(self, log):
+        self.log = log
 
-    def write(self):
-        output_dir = self._get_output_directory()
-        log_pathname = output_dir / "logs.txt"
-        with log_pathname.open(mode='wb') as f:
-            f.write(self.logs)
+    def write_log(self):
+        pn = self.output_dir / "log.txt"
+        with pn.open(mode='wb') as f:
+            f.write(self.log)
+
+    def write_status(self):
+        pn = self.output_dir / "status.json"
+        with pn.open(mode='w') as f:
+            json.dump(self.status, f)
 
     def _get_output_directory(self):
         if not os.path.exists(self.output_basedir):
@@ -57,12 +105,10 @@ class DockRun(DockRunServicer):
             message = "task '{}' not found.".format(req.task_name)
             return RunTaskReply(is_succeed=False, message=message)
 
-        logs = self._run_task(task)
-        report = {
-            "succeed": True,
-        };
-        reporter = FileReporter(req.task_name, report, logs)
-        reporter.write()
+        # generate process
+        #self._run_task(task)
+        executor.submit(run_task, req.task_name, task)
+
         return RunTaskReply(is_succeed=True, message="")
 
     def _run_task(self, task):
@@ -79,7 +125,15 @@ class DockRun(DockRunServicer):
         if task.get("auto_remove", True):
             container.remove()
 
-        return logs
+        report = {
+            "succeeded": False,
+            "status": None,
+        };
+
+        reporter = FileReporter(req.task_name, report, logs)
+        reporter.write()
+
+        return
 
 def main():
     server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))