fix component output data no header

Signed-off-by: zengjice <[email protected]>
pyisong · Jun 6, 2020 · 3b0644e · 3b0644e
1 parent 918b2c6
commit 3b0644e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/fate_flow/driver/task_scheduler.py b/fate_flow/driver/task_scheduler.py
@@ -644,7 +644,8 @@ def stop(job_id, end_status=JobStatus.FAILED, component_name=''):
     @staticmethod
     def clean_queue():
         schedule_logger().info('get clean queue command')
-        jobs = job_utils.query_job(is_initiator=1, status=JobStatus.WAITING)
+        # jobs = job_utils.query_job(is_initiator=1, status=JobStatus.WAITING)
+        jobs = job_utils.query_job(status=JobStatus.WAITING)
         if jobs:
             for job in jobs:
                 schedule_logger(job.f_job_id).info(

diff --git a/fate_flow/manager/queue_manager.py b/fate_flow/manager/queue_manager.py
@@ -105,10 +105,10 @@ def put(self, item, block=True, timeout=None, status=None, job_id=''):
                 try:
                     is_failed = self.update_event(item=item, status=status, job_id=job_id, operating='put')
                 except Exception as e:
-                    error =e
+                    error = e
                 MysqlQueue.unlock(DB, 'fate_flow_job_queue')
                 if error:
-                    raise Exception(e)
+                    raise Exception(error)
             self.not_empty.notify()
             return is_failed
 

diff --git a/fate_flow/manager/tracking_manager.py b/fate_flow/manager/tracking_manager.py
@@ -197,8 +197,11 @@ def save_output_data_table(self, data_table: Table, data_name: str = 'component'
             persistent_table = data_table.save_as(
                 namespace=persistent_table_namespace,
                 name=persistent_table_name)
+            persistent_table_metas = {}
+            persistent_table_metas.update(data_table.get_metas())
+            persistent_table_metas["schema"] = data_table.schema
             session.save_data_table_meta(
-                {'schema': data_table.schema, 'header': data_table.schema.get('header', [])},
+                persistent_table_metas,
                 data_table_namespace=persistent_table.get_namespace(), data_table_name=persistent_table.get_name())
             data_table_info = {
                 data_name: {'name': persistent_table.get_name(), 'namespace': persistent_table.get_namespace()}}

diff --git a/fate_flow/db/SQL/alert.sql → fate_flow/upgrade/1_4_0-1_4_1/upgrade.sql b/fate_flow/db/SQL/alert.sql → fate_flow/upgrade/1_4_0-1_4_1/upgrade.sql