toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改：hpc回传走data服务优化

Browse Source
This commit is contained in:
yangyang01000846
2026-01-14 09:15:09 +08:00
parent 66cef19a26
commit c1cd0a4ef7
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/com/sdm/common/utils/HpcCommandExcuteUtil.java
View File

@@ -172,13 +172,18 @@ public class HpcCommandExcuteUtil {
return builder.body(body);
}
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId, String workDir,String minioBucket,String callBackMinioDir,String callBackNasDir) {
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId, String workDir,String minioBucket,
String callBackMinioDir,String callBackNasDir,
Long dirId,Long userId,Long tenantId) {
com.alibaba.fastjson2.JSONObject paramJson = new com.alibaba.fastjson2.JSONObject();
paramJson.put("jobId", jobId);
paramJson.put("jobWorkDir", workDir);
paramJson.put("minioBucket", minioBucket);
paramJson.put("callBackMinioDir", callBackMinioDir);
paramJson.put("callBackNasDir", callBackNasDir);
paramJson.put("dirId", dirId);
paramJson.put("userId", userId);
paramJson.put("tenantId", tenantId);
Boolean call = false;
String resultString = "";
try {

4
pbs/src/main/java/com/sdm/pbs/controller/TaskController.java
View File

@@ -239,7 +239,9 @@ public class TaskController {
@PostMapping("/callHpcUploadToTarget")
public SdmResponse<Boolean> hpcDownloadFiles(@RequestBody Map paramMap) {
return hpcInstructionService.callHpcUploadToTarget(paramMap.get("jobId").toString(), paramMap.get("jobWorkDir").toString(),
paramMap.get("minioBucket").toString(), paramMap.get("callBackMinioDir").toString(),paramMap.get("callBackNasDir").toString());
paramMap.get("minioBucket").toString(), paramMap.get("callBackMinioDir").toString()
,paramMap.get("callBackNasDir").toString(), Long.valueOf(paramMap.get("dirId").toString()),
Long.valueOf(paramMap.get("userId").toString()),Long.valueOf(paramMap.get("tenantId").toString()));
}
}

4
pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java
View File

@@ -44,9 +44,11 @@ public class FinishedStatusHandler implements JobStatusHandler {
statusInfo.getStartTime(), statusInfo.getEndTime(), TimeUnit.SECONDS));
newDbJob.setUpdateTime(LocalDateTime.now());
String minioBucket = minioBucketPrefix + newDbJob.getTenantId();
Long userId=newDbJob.getCreatorId();
Long tenantId = newDbJob.getTenantId();
// 通知工具回传文件 minio 或者 nas
SdmResponse<Boolean> callResponse = hpcInstructionService.callHpcUploadToTarget(newDbJob.getJobId(), newDbJob.getStdoutHpcFilePath(),minioBucket,
newDbJob.getStdoutSpdmMinoFilePath(),newDbJob.getStdoutSpdmNasFilePath());
newDbJob.getStdoutSpdmMinoFilePath(),newDbJob.getStdoutSpdmNasFilePath(),newDbJob.getDirId(),userId,tenantId);
if (!callResponse.isSuccess()||!callResponse.getData()) {
CoreLogger.error("callHpcUploadToTarget failed,jobId:{},workDir:{}",newDbJob.getJobId(),newDbJob.getStdoutHpcFilePath());
return;

4
pbs/src/main/java/com/sdm/pbs/service/HpcInstructionService.java
View File

@@ -55,6 +55,8 @@ public interface HpcInstructionService {
ResponseEntity<StreamingResponseBody> hpcDownloadFile(String fileName,Long fileSize);
// 通知hpc回传文件
SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket,String callBackMinioDir,String callBackNasDir);
SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket,
String callBackMinioDir,String callBackNasDir,Long dirId,
Long userId,Long tenantId);
}

7
pbs/src/main/java/com/sdm/pbs/service/impl/HpcInstructionServiceImpl.java
View File

@@ -489,8 +489,11 @@ public class HpcInstructionServiceImpl implements HpcInstructionService {
}
@Override
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket,String callBackMinioDir,String callBackNasDir) {
return hpcCommandExcuteUtil.callHpcUploadToTarget(jobId,workDir,minioBucket,callBackMinioDir,callBackNasDir);
public SdmResponse<Boolean> callHpcUploadToTarget(String jobId,String workDir,String minioBucket,
String callBackMinioDir,String callBackNasDir,Long dirId,
Long userId,Long tenantId) {
return hpcCommandExcuteUtil.callHpcUploadToTarget(jobId,workDir,minioBucket,callBackMinioDir,
callBackNasDir,dirId,userId,tenantId);
}
/**