update ScriptLog.state correctly

Author: AlexCXC

scheduler/app/faas_scheduler/models.py

@@ -54,8 +54,8 @@ def __init__(
         self.script_name = script_name
         self.context_data = context_data
         self.started_at = started_at
-        self.operate_from = operate_from
         self.state = state
+        self.operate_from = operate_from
 
     def get_info(self):
         return {

scheduler/app/faas_scheduler/utils.py

@@ -381,6 +381,7 @@ def add_script(
         script_name,
         context_data,
         datetime.now(),
+        ScriptLog.PENDING,
         operate_from,
     )
     db_session.add(script)
@@ -394,6 +395,7 @@ def update_script(db_session, script, success, return_code, output):
     script.success = success
     script.return_code = return_code
     script.output = output
+    script.state = ScriptLog.FINISHED
     db_session.commit()
 
     return script

scheduler/app/scheduler.py

@@ -200,7 +200,13 @@ def schedule(self):
             if not script_log:
                 time.sleep(0.5)
                 continue
+            db_session = DBSession()
             try:
+                db_session.query(ScriptLog).filter(ScriptLog.id==script_log.id).update(
+                    {ScriptLog.state: ScriptLog.RUNNING},
+                    synchronize_session=False
+                )
+                db_session.commit()
                 script_file_info = get_script_file(script_log.dtable_uuid, script_log.script_name)
                 run_script(
                     script_log.id,
@@ -212,6 +218,8 @@ def schedule(self):
                 )
             except Exception as e:
                 logger.exception(f'run script: {script_log} error {e}')
+            finally:
+                DBSession.remove()
 
     def script_done_callback(
             self,
@@ -255,7 +263,8 @@ def timeout_setter(self):
                             ScriptLog.success: False,
                             ScriptLog.output: TIMEOUT_OUTPUT,
                             ScriptLog.return_code: -1
-                        }
+                        },
+                        synchronize_session=False
                     )
             except Exception as e:
                 logger.exception(e)
@@ -271,6 +280,8 @@ def statistic_cleaner(self):
                 delete_statistics_after_days(db_session)
             except Exception as e:
                 logger.exception(e)
+            finally:
+                DBSession.remove()
             time.sleep(24 * 60 * 60)
 
     def start(self):