Commit 01eaedfa authored by qiaozhanwei's avatar qiaozhanwei
Browse files

determine whether the tenant path exists when the tenant deletes

parent e33d9767

escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java

+14 −16
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ public class TenantService extends BaseService{ 
    if (PropertyUtils.getResUploadStartupState()){

      String tenantPath = HadoopUtils.getHdfsDataBasePath() + "/" + tenant.getTenantCode();



      if (HadoopUtils.getInstance().exists(tenantPath)){

        String resourcePath = HadoopUtils.getHdfsDir(tenant.getTenantCode());

        FileStatus[] fileStatus = HadoopUtils.getInstance().listFileStatus(resourcePath);

        if (fileStatus.length > 0) {
@@ -253,10 +254,10 @@ public class TenantService extends BaseService{ 


        HadoopUtils.getInstance().delete(tenantPath, true);

      }

    }



    tenantMapper.deleteById(id);

    putMsg(result, Status.SUCCESS);

    

    return result;

  }
@@ -269,9 +270,6 @@ public class TenantService extends BaseService{ 
  public Map<String, Object> queryTenantList(User loginUser) {



    Map<String, Object> result = new HashMap<>(5);

//    if (checkAdmin(loginUser, result)) {

//      return result;

//    }



    List<Tenant> resourceList = tenantMapper.queryAllTenant();

    result.put(Constants.DATA_LIST, resourceList);