Merge branch 'master' of http://gogsb.soaringnova.com/sxwl_DL/datax-admin

.gitignore

@@ -1,3 +1,4 @@
 __pycache__/
 /.idea/
-/.vscode/
+/.vscode/
+.DS_Store

app/core/airflow/task.py

@@ -136,7 +136,8 @@ class SparksTaskCompiler(TaskCompiler):
 
 
         if config.get('K8S', 'enable_kerberos', fallback=None) in ['true', "True", True]:
-            basic_cmds = f"kinit -kt /workspace/conf/user.keytab ailab && {basic_cmds}"
+            principal = config.get('HIVE', 'principal', fallback=None)
+            basic_cmds = f"kinit -kt /workspace/conf/user.keytab {principal} && {basic_cmds}"
 
 
         self.cmd_str = lambda name: f"{basic_cmds} --name {name} {param_str} run.py"

app/core/airflow/templates/dag_template.py.jinja2

@@ -59,6 +59,7 @@ with DAG(start_date=datetime(2022,6,1),catchup=False,schedule_interval=None if '
                                                                     random_name_suffix=True,
                                                                     labels={'app':'backend', 'env':'dev', 'run_ts':{{ "'{{ ts_nodash }}'" }} },
                                                                     reattach_on_restart=True,
+                                                                    startup_timeout_seconds=600,
                                                                     is_delete_operator_pod=False,
                                                                     get_logs=True,
                                                                     {% if image_pull_key != None or image_pull_key != ""%}image_pull_secrets='{{ image_pull_key }}',{% endif %}

txprod.ini

@@ -68,8 +68,8 @@ hadoop_config={
              }
 kerberos_config = {
                     "haveKerberos": "true",
-                    "kerberosKeytabFilePath": "/workspace/confs/test/user.keytab",
-                    "kerberosPrincipal": "ailab@EMR-5XJSY31F"
+                    "kerberosKeytabFilePath": "/workspace/confs/user.keytab",
+                    "kerberosPrincipal": "ylaiuser@EMR-56L6ZNTS"
                   }
 
 [LAKE_HADOOP_INNER]