|
|
@@ -93,13 +93,17 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { |
|
|
public List<ExperimentIns> getByExperimentId(Integer experimentId) { |
|
|
public List<ExperimentIns> getByExperimentId(Integer experimentId) { |
|
|
List<ExperimentIns> experimentInsList = experimentInsDao.getByExperimentId(experimentId); |
|
|
List<ExperimentIns> experimentInsList = experimentInsDao.getByExperimentId(experimentId); |
|
|
for (ExperimentIns experimentIns: experimentInsList) { |
|
|
for (ExperimentIns experimentIns: experimentInsList) { |
|
|
if (experimentIns!=null && StringUtils.isEmpty(experimentIns.getStatus())) { |
|
|
|
|
|
Integer experimentInsId = experimentIns.getId(); |
|
|
|
|
|
String status = this.queryStatusFromArgo(experimentIns.getArgoInsNs(), experimentIns.getArgoInsName(),experimentInsId); |
|
|
|
|
|
experimentIns.setStatus(status); |
|
|
|
|
|
this.update(experimentIns); |
|
|
|
|
|
|
|
|
if ( experimentIns!=null && (StringUtils.isEmpty(experimentIns.getStatus())) || StringUtils.equals(experimentIns.getStatus(), "Running") || StringUtils.equals(experimentIns.getStatus(),"Pending")) { |
|
|
|
|
|
// //当原本状态为null或running或Pending时才调用argo接口 |
|
|
|
|
|
String newStatus = this.queryStatusFromArgo(experimentIns.getArgoInsNs(), experimentIns.getArgoInsName(),experimentIns.getId()); |
|
|
|
|
|
experimentIns.setStatus(newStatus); |
|
|
|
|
|
//只有当新状态是终止态时才更新数据库 |
|
|
|
|
|
if (!(StringUtils.equals(newStatus, "Running") || StringUtils.equals(newStatus,"Pending"))) { |
|
|
|
|
|
this.update(experimentIns); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return experimentInsList; |
|
|
return experimentInsList; |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|