update

Author: AlexCXC

scheduler/app/faas_scheduler/utils.py

@@ -170,6 +170,7 @@ def call_faas_func(script_url, temp_api_token, context_data, script_id=None):
             },
             "context_data": context_data,
             "script_id": script_id,
+            "timeout": int(SUB_PROCESS_TIMEOUT)
         }
         headers = {"User-Agent": "python-scheduler/" + VERSION}
         logger.debug("I call starter at url %s", RUN_FUNC_URL)

scheduler/app/flask_server.py

@@ -23,7 +23,7 @@
     uuid_str_to_32_chars,
     basic_log,
 )
-from .scheduler import scheduler
+from scheduler import scheduler
 
 
 basic_log("scheduler.log")
@@ -132,15 +132,15 @@ def script_api(script_id):
         if dtable_uuid != script.dtable_uuid or script_name != script.script_name:
             return make_response(("Bad request", 400))
 
-        # if SUB_PROCESS_TIMEOUT and isinstance(SUB_PROCESS_TIMEOUT, int):
-        #     now = datetime.now()
-        #     duration_seconds = (now - script.started_at).seconds
-        #     if duration_seconds > SUB_PROCESS_TIMEOUT:
-        #         script.success = False
-        #         script.return_code = -1
-        #         script.finished_at = now
-        #         script.output = TIMEOUT_OUTPUT
-        #         db_session.commit()
+        if SUB_PROCESS_TIMEOUT and isinstance(SUB_PROCESS_TIMEOUT, int):
+            now = datetime.now()
+            duration_seconds = (now - script.started_at).seconds
+            if duration_seconds > SUB_PROCESS_TIMEOUT:
+                script.success = False
+                script.return_code = -1
+                script.finished_at = now
+                script.output = TIMEOUT_OUTPUT
+                db_session.commit()
 
         return make_response(({"script": script.to_dict()}, 200))
 
@@ -373,5 +373,6 @@ def base_run_python_statistics():
 
 
 if __name__ == "__main__":
+    scheduler.start()
     http_server = WSGIServer(("127.0.0.1", 5055), app)
     http_server.serve_forever()

scheduler/app/scheduler.py

@@ -30,15 +30,15 @@ def __init__(self):
         #     "<team>_<dtable_uuid>_<script_name>": 0
         # }
         try:
-            run_limit_per_team = os.environ.get('RUN_LIMIT_PER_TEAM', 0)
+            run_limit_per_team = int(os.environ.get('RUN_LIMIT_PER_TEAM', 0))
         except:
             run_limit_per_team = 0
         try:
-            run_limit_per_base = os.environ.get('RUN_LIMIT_PER_BASE', 0)
+            run_limit_per_base = int(os.environ.get('RUN_LIMIT_PER_BASE', 0))
         except:
             run_limit_per_base = 0
         try:
-            run_limit_per_script = os.environ.get('RUN_LIMIT_PER_SCRIPT', 0)
+            run_limit_per_script = int(os.environ.get('RUN_LIMIT_PER_SCRIPT', 0))
         except:
             run_limit_per_script = 0
         self.config = {
@@ -135,10 +135,11 @@ def schedule(self):
             script_log = self.script_queue.get()
             if not script_log:
                 time.sleep(0.5)
+                continue
             try:
                 script_file_info = get_script_file(script_log.dtable_uuid, script_log.script_name)
                 run_script(
-                    script_log.script_id,
+                    script_log.id,
                     script_log.dtable_uuid,
                     script_log.script_name,
                     script_file_info['script_url'],

starter/runner.py

@@ -459,4 +459,4 @@ def health_check():
 
 
 if __name__ == "__main__":
-    app.run(port=8088, debug=False)
+    app.run(host='0.0.0.0', port=8088, debug=False)