From ec600ffd018ab560b3054b6a9edc99b200d5bf4f Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Mon, 10 Jun 2019 11:20:43 +0800
Subject: [PATCH 1/3] Added checks on whether HDFS is configured to be true

---
 .../escheduler/api/service/TenantService.java | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
index 68fbc55348..c38f0f72ad 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
@@ -230,21 +230,29 @@ public class TenantService extends BaseService{
 
     Tenant tenant = tenantMapper.queryById(id);
 
-    String tenantPath = HadoopUtils.getHdfsDataBasePath() + "/" + tenant.getTenantCode();
-
-    String resourcePath = HadoopUtils.getHdfsDir(tenant.getTenantCode());
-    FileStatus[] fileStatus = HadoopUtils.getInstance().listFileStatus(resourcePath);
-    if (fileStatus.length > 0) {
-      putMsg(result, Status.HDFS_TERANT_RESOURCES_FILE_EXISTS);
-      return result;
-    }
-    fileStatus = HadoopUtils.getInstance().listFileStatus(HadoopUtils.getHdfsUdfDir(tenant.getTenantCode()));
-    if (fileStatus.length > 0) {
-      putMsg(result, Status.HDFS_TERANT_UDFS_FILE_EXISTS);
+    if (tenant == null){
+      putMsg(result, Status.TENANT_NOT_EXIST);
       return result;
     }
 
-    HadoopUtils.getInstance().delete(tenantPath, true);
+    // if hdfs startup
+    if (PropertyUtils.getBoolean(cn.escheduler.common.Constants.HDFS_STARTUP_STATE)){
+      String tenantPath = HadoopUtils.getHdfsDataBasePath() + "/" + tenant.getTenantCode();
+
+      String resourcePath = HadoopUtils.getHdfsDir(tenant.getTenantCode());
+      FileStatus[] fileStatus = HadoopUtils.getInstance().listFileStatus(resourcePath);
+      if (fileStatus.length > 0) {
+        putMsg(result, Status.HDFS_TERANT_RESOURCES_FILE_EXISTS);
+        return result;
+      }
+      fileStatus = HadoopUtils.getInstance().listFileStatus(HadoopUtils.getHdfsUdfDir(tenant.getTenantCode()));
+      if (fileStatus.length > 0) {
+        putMsg(result, Status.HDFS_TERANT_UDFS_FILE_EXISTS);
+        return result;
+      }
+
+      HadoopUtils.getInstance().delete(tenantPath, true);
+    }
 
     tenantMapper.deleteById(id);
     putMsg(result, Status.SUCCESS);

From b7d0d4c952c42494a1e238d89b2d400a38acb9ae Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Mon, 10 Jun 2019 11:24:14 +0800
Subject: [PATCH 2/3] change Status.USER_NOT_EXIST to Status.TENANT_NOT_EXIST

---
 .../src/main/java/cn/escheduler/api/service/TenantService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
index c38f0f72ad..12624231a7 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
@@ -166,7 +166,7 @@ public class TenantService extends BaseService{
     Tenant tenant = tenantMapper.queryById(id);
 
     if (tenant == null){
-      putMsg(result, Status.USER_NOT_EXIST, id);
+      putMsg(result, Status.TENANT_NOT_EXIST);
       return result;
     }
 

From 7f4f65db6e67e7865b99255662253ef35733d491 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Mon, 10 Jun 2019 16:15:50 +0800
Subject: [PATCH 3/3] Added the ability to sort by timing status

---
 .../escheduler/dao/mapper/ProcessDefinitionMapperProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java
index a619ee4ad5..48e8d0bdf0 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java
@@ -189,7 +189,7 @@ public class ProcessDefinitionMapperProvider {
             if(userId != null && 0 != Integer.parseInt(userId.toString())){
                 WHERE("td.user_id = #{userId}");
             }
-            ORDER_BY(" td.update_time desc limit #{offset},#{pageSize} ");
+            ORDER_BY(" sc.schedule_release_state desc,td.update_time desc limit #{offset},#{pageSize} ");
         }}.toString();
     }
     /**