natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

running through the big process error modify (#962) 

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify
This commit is contained in:
qiaozhanwei 2019-10-08 18:31:24 +08:00 committed by lgcareer
parent 31f9fbf335
commit ed04835c95
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
View File

@ -194,7 +194,11 @@ public class ProcessInstanceService extends BaseDAGService {
project.getId(), processDefineId, searchVal, statusArray, host, start, end);
for(ProcessInstance processInstance:processInstanceList.getRecords()){
processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(),processInstance.getEndTime()));
if (StringUtils.isNotEmpty(startDate)
&& StringUtils.isNotEmpty(endDate)){
processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(),processInstance.getEndTime()));
}
}
Set<String> exclusionSet = new HashSet<String>(){{
@ -205,7 +209,7 @@ public class ProcessInstanceService extends BaseDAGService {
}};
PageInfo pageInfo = new PageInfo<ProcessInstance>(pageNo, pageSize);
pageInfo.setTotalCount((int)processInstanceList.getTotal());
pageInfo.setTotalCount((int) processInstanceList.getTotal());
pageInfo.setLists(CollectionUtils.getListByExclusion(processInstanceList.getRecords(), exclusionSet));
result.put(Constants.DATA_LIST, pageInfo);
putMsg(result, Status.SUCCESS);

2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java
View File

@ -141,7 +141,7 @@ public class ZKMasterClient extends AbstractZKClient {
*/
public void initDao(){
this.alertDao = DaoFactory.getDaoInstance(AlertDao.class);
this.processDao = DaoFactory.getDaoInstance(ProcessDao.class);
// this.processDao = DaoFactory.getDaoInstance(ProcessDao.class);
}
/**
* get alert dao