diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
index 31c8c0222d9a0c3cf6d2f2f73c4f2ff2fd1a2030..d6fb6b219cbbe3d12a2c2d3db17d53148325488a 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
@@ -175,6 +175,14 @@ public class TenantServiceTest {
         logger.info(result.toString());
         List<Tenant> tenantList = (List<Tenant>) result.get(Constants.DATA_LIST);
         Assert.assertTrue(CollectionUtils.isNotEmpty(tenantList));
+
+        Mockito.when( tenantMapper.queryByTenantCode("1")).thenReturn(getList());
+        Map<String, Object> successRes = tenantService.queryTenantList("1");
+        Assert.assertEquals(Status.SUCCESS,successRes.get(Constants.STATUS));
+
+        Mockito.when( tenantMapper.queryByTenantCode("1")).thenReturn(null);
+        Map<String, Object> tenantNotExistRes = tenantService.queryTenantList("1");
+        Assert.assertEquals(Status.TENANT_NOT_EXIST,tenantNotExistRes.get(Constants.STATUS));
     }
 
     @Test
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java
index b3626fa8a9e31aa2e68f2bd7b60846143ded57b4..0d89d4b6e3eac144de476f61bbee18a370ead0c8 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java
@@ -28,7 +28,7 @@ public class ZookeeperMonitorUtilsTest {
 
 
     @Test
-    public void testGetMasterLsit(){
+    public void testGetMasterList(){
 
         ZookeeperMonitor zookeeperMonitor = new ZookeeperMonitor();
 
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
index 19dbf46a6bfa3fa433206dfbb076773548cdc5e0..1a8c09e6118ff728b9728ea02440c4c92c7ab39a 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
@@ -144,9 +144,11 @@ public class AlertDao extends AbstractBaseDao {
      * @param taskId taskId
      * @param taskName taskName
      */
-    public void sendTaskTimeoutAlert(int alertgroupId,String receivers,String receiversCc,int taskId,String taskName){
+    public void sendTaskTimeoutAlert(int alertgroupId,String receivers,String receiversCc, int processInstanceId,
+                                     String processInstanceName, int taskId,String taskName){
         Alert alert = new Alert();
-        String content = String.format("[{'id':'%d','name':'%s','event':'timeout','warnLevel':'middle'}]",taskId,taskName);
+        String content = String.format("[{'process instance id':'%d','task name':'%s','task id':'%d','task name':'%s'," +
+                        "'event':'timeout','warnLevel':'middle'}]", processInstanceId, processInstanceName, taskId, taskName);
         alert.setTitle("Task Timeout Warn");
         alert.setShowType(ShowType.TABLE);
         alert.setContent(content);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
index 66d1a3f4c2d633e7a46a9d21be41e44157ffcec3..37262c05e217108de15f9bb25d9a5d07d9723f5b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
@@ -128,7 +128,9 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
                         // process define
                         ProcessDefinition processDefine = processService.findProcessDefineById(processInstance.getProcessDefinitionId());
                         // send warn mail
-                        alertDao.sendTaskTimeoutAlert(processInstance.getWarningGroupId(),processDefine.getReceivers(),processDefine.getReceiversCc(),taskInstance.getId(),taskInstance.getName());
+                        alertDao.sendTaskTimeoutAlert(processInstance.getWarningGroupId(),processDefine.getReceivers(),
+                                processDefine.getReceiversCc(), processInstance.getId(), processInstance.getName(),
+                                taskInstance.getId(),taskInstance.getName());
                         checkTimeout = false;
                     }
                 }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java
index f3441edd173a54df798cbf8de3d9a0cb01a1cde4..050af1eec5d82fb411942fcd87dde07d90621dfc 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java
@@ -133,6 +133,8 @@ public class AlertManager {
                     continue;
                 }
                 LinkedHashMap<String, String> failedTaskMap = new LinkedHashMap();
+                failedTaskMap.put("process instance id", String.valueOf(processInstance.getId()));
+                failedTaskMap.put("process instance name", processInstance.getName());
                 failedTaskMap.put("task id", String.valueOf(task.getId()));
                 failedTaskMap.put("task name", task.getName());
                 failedTaskMap.put("task type", task.getTaskType());
@@ -193,7 +195,7 @@ public class AlertManager {
             logger.info("add alert to db , alert : {}", alert.toString());
 
         }catch (Exception e){
-            logger.error("send alert failed! " + e);
+            logger.error("send alert failed:{} ", e.getMessage());
         }
 
     }
diff --git a/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql b/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql
index 790a9a8ada9500d0dd826f38eeff299296a30b14..e5785d999775ffc60fc634c2e4abaf75b7f01aec 100644
--- a/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql
@@ -36,7 +36,7 @@ delimiter ;
 CALL uc_dolphin_T_t_ds_process_definition_A_modify_by;
 DROP PROCEDURE uc_dolphin_T_t_ds_process_definition_A_modify_by;
 
--- uc_dolphin_T_t_ds_process_definition_A_modify_by
+-- uc_dolphin_T_t_ds_task_instance_A_executor_id
 drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_task_instance_A_executor_id;
 delimiter d//
 CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_A_executor_id()
diff --git a/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql b/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql
index cbe7c22bbe424cfa9a9515018272ddaaf2810814..70471cb26da2f963c704bd81fe604d44048ce768 100644
--- a/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql
@@ -32,7 +32,7 @@ delimiter ;
 SELECT uc_dolphin_T_t_ds_process_definition_A_modify_by();
 DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_process_definition_A_modify_by();
 
--- uc_dolphin_T_t_ds_process_definition_A_modify_by
+-- uc_dolphin_T_t_ds_task_instance_A_executor_id
 delimiter d//
 CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_executor_id() RETURNS void AS $$
 BEGIN