Доделал Planner. Для компиляции тоже заменил старый Do на DoWithSchedule
Добавил сохранение в архив задач на компиляцию. Закомментирова info txt который почему то в архив клался пустым, вместо него кладу в архив файлы TaskState и total_time. Адаптировал анализ под распаковку архива. При сохранении в бд, удаляю задачи на компиляцию.
This commit is contained in:
@@ -12,6 +12,7 @@ import TestingSystem.DVM.Tasks.TestRunTask;
|
||||
import TestingSystem.DVM.Tasks.TestTask;
|
||||
import TestingSystem.DVM.TasksPackage.TasksPackage;
|
||||
import TestingSystem.DVM.TasksPackage.TasksPackageState;
|
||||
import Visual_DVM_2021.Passes.All.UnzipFolderPass;
|
||||
import com.jcraft.jsch.ChannelSftp;
|
||||
import javafx.util.Pair;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
@@ -37,7 +38,6 @@ public class TestsSupervisor_2022 {
|
||||
connection = connection_in;
|
||||
tasksPackage = tasksPackage_in;
|
||||
compilationTasks = tasks_in;
|
||||
planner.Print(getClass().getSimpleName() + ": найдено задач на компиляцию: " + compilationTasks.size());
|
||||
packageRemoteWorkspace = new RemoteFile(tasksPackage.user_workspace + "/tests", String.valueOf(tasksPackage.id), true);
|
||||
packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(tasksPackage.id));
|
||||
}
|
||||
@@ -170,53 +170,12 @@ public class TestsSupervisor_2022 {
|
||||
}
|
||||
public void DownloadResults() throws Exception {
|
||||
Utils.CheckDirectory(packageLocalWorkspace);
|
||||
for (TestCompilationTask testCompilationTask : compilationTasks) {
|
||||
//------------>>>
|
||||
if (TryDownloadTask(testCompilationTask)) {
|
||||
for (TestRunTask testRunTask : testCompilationTask.runTasks) {
|
||||
TryDownloadTask(testRunTask);
|
||||
}
|
||||
} else {
|
||||
//задача на компиляцию не состоялась. значит и все ее задачи на запуск тоже.
|
||||
for (TestRunTask testRunTask : testCompilationTask.runTasks) {
|
||||
testRunTask.state = TaskState.Canceled;
|
||||
planner.UpdateTask(testRunTask);
|
||||
}
|
||||
}
|
||||
//--->>>>>>>>>
|
||||
}
|
||||
}
|
||||
public boolean TryDownloadTask(TestTask testTask) throws Exception {
|
||||
if (
|
||||
!testTask.state.equals(TaskState.ResultsDownloaded) &&
|
||||
!testTask.state.equals(TaskState.Canceled)
|
||||
) {
|
||||
File taskLocalWorkspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), String.valueOf(testTask.id)).toFile();
|
||||
RemoteFile taskRemoteWorkspace = new RemoteFile(packageRemoteWorkspace.full_name, String.valueOf(testTask.id));
|
||||
Utils.CheckDirectory(taskLocalWorkspace);
|
||||
if (connection.Exists(packageRemoteWorkspace.full_name, String.valueOf(testTask.id))) {
|
||||
CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, Constants.out_file);
|
||||
CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, Constants.err_file);
|
||||
CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, Constants.time_file);
|
||||
CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, "TaskState");
|
||||
if (testTask instanceof TestRunTask)
|
||||
CheckTaskFile(taskRemoteWorkspace, taskLocalWorkspace, "sts.gz+");
|
||||
testTask.state = TaskState.ResultsDownloaded;
|
||||
planner.UpdateTask(testTask);
|
||||
return true;
|
||||
} else {
|
||||
testTask.state = TaskState.Canceled;
|
||||
planner.UpdateTask(testTask);
|
||||
return false;
|
||||
//нет раб пространства. значит задача не выполнялась.
|
||||
}
|
||||
} else return true;
|
||||
}
|
||||
public void CheckTaskFile(RemoteFile taskRemoteWorkspace, File taskLocalWorkspace, String fileName) throws Exception {
|
||||
RemoteFile rFile = new RemoteFile(taskRemoteWorkspace.full_name, fileName);
|
||||
File lFile = Paths.get(taskLocalWorkspace.getAbsolutePath(), fileName).toFile();
|
||||
if (connection.Exists(taskRemoteWorkspace.full_name, fileName)) {
|
||||
connection.getSingleFile(rFile, lFile, 0);
|
||||
RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace.full_name, "results.zip");
|
||||
File results_archive = new File(packageLocalWorkspace, "results.zip");
|
||||
if (connection.Exists(packageRemoteWorkspace.full_name, "results.zip")) {
|
||||
connection.getSingleFile(remote_results_archive, results_archive, 0);
|
||||
UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
|
||||
unzipFolderPass.Do(results_archive.getAbsolutePath(), packageLocalWorkspace.getAbsolutePath(), false);
|
||||
}
|
||||
}
|
||||
public void AnalyseResults() throws Exception {
|
||||
@@ -226,7 +185,6 @@ public class TestsSupervisor_2022 {
|
||||
for (TestCompilationTask testCompilationTask : compilationTasks) {
|
||||
ct_count++;
|
||||
if (CheckTask(testCompilationTask)) {
|
||||
// planner.UpdateTask(testCompilationTask);
|
||||
for (TestRunTask testRunTask : testCompilationTask.runTasks) {
|
||||
rt_count++;
|
||||
testRunTask.compilation_state = testCompilationTask.state;
|
||||
@@ -237,7 +195,6 @@ public class TestsSupervisor_2022 {
|
||||
} else {
|
||||
CheckTask(testRunTask);
|
||||
}
|
||||
// planner.UpdateTask(testRunTask);
|
||||
if (testRunTask.state.equals(TaskState.Finished)) {
|
||||
//анализ задачи на запуск.
|
||||
List<String> output_lines = Arrays.asList(testRunTask.output.split("\n"));
|
||||
@@ -261,55 +218,33 @@ public class TestsSupervisor_2022 {
|
||||
testRunTask.progress = results.getValue();
|
||||
testRunTask.CleanTime = Utils.parseCleanTime(testRunTask.output);
|
||||
}
|
||||
File local_sts_text = Utils.getTempFileName("sts_text");
|
||||
Vector<ChannelSftp.LsEntry> files = connection.sftpChannel.ls(testRunTask.remote_workspace);
|
||||
for (ChannelSftp.LsEntry file : files) {
|
||||
if (file.getFilename().equals("sts.gz+")) {
|
||||
RemoteFile remote_sts = new RemoteFile(
|
||||
testRunTask.remote_workspace, file.getFilename(), false);
|
||||
RemoteFile remote_sts_text = new RemoteFile(
|
||||
testRunTask.remote_workspace, "statistic.txt", false);
|
||||
try {
|
||||
connection.ShellCommand(Utils.DQuotes(tasksPackage.dvm_drv) + " pa " +
|
||||
Utils.DQuotes(remote_sts.full_name) + " " + Utils.DQuotes(remote_sts_text.full_name));
|
||||
connection.getSingleFile(remote_sts_text, local_sts_text, 10240);
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
if (local_sts_text.exists()) {
|
||||
try {
|
||||
testRunTask.statistic = FileUtils.readFileToString(local_sts_text, Charset.defaultCharset());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
//planner.UpdateTask(testRunTask);
|
||||
}
|
||||
}
|
||||
}
|
||||
System.out.println("ct_count=" + ct_count + " rt count=" + rt_count);
|
||||
//теперь обновить их единым списком.
|
||||
//теперь обновить их единым списком, и удалить задачи на компиляцию.
|
||||
planner.ServerCommand(ServerCode.UpdateTestTasks, compilationTasks);
|
||||
|
||||
}
|
||||
public boolean CheckTask(TestTask testTask) throws Exception {
|
||||
if (testTask.state.equals(TaskState.ResultsDownloaded)) {
|
||||
File taskWorkspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), String.valueOf(testTask.id)).toFile();
|
||||
File taskWorkspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(testTask.id)).toFile();
|
||||
if (taskWorkspace.exists()) {
|
||||
System.out.println("id=" + testTask.id + ": path=" + taskWorkspace.getAbsolutePath());
|
||||
File stateFile = Paths.get(taskWorkspace.getAbsolutePath(), "TaskState").toFile();
|
||||
File outFile = Paths.get(taskWorkspace.getAbsolutePath(), Constants.out_file).toFile();
|
||||
File errFile = Paths.get(taskWorkspace.getAbsolutePath(), Constants.err_file).toFile();
|
||||
File timeFile = Paths.get(taskWorkspace.getAbsolutePath(), Constants.time_file).toFile();
|
||||
File stateFile = new File(taskWorkspace, "TaskState");
|
||||
File outFile = new File(taskWorkspace, Constants.out_file);
|
||||
File errFile = new File(taskWorkspace.getAbsolutePath(), Constants.err_file);
|
||||
File timeFile = new File(taskWorkspace.getAbsolutePath(), Constants.time_file);
|
||||
File stsFile = new File(taskWorkspace.getAbsolutePath(), "statistic.txt");
|
||||
if (outFile.exists())
|
||||
testTask.output = FileUtils.readFileToString(outFile);
|
||||
if (errFile.exists())
|
||||
testTask.errors = FileUtils.readFileToString(errFile);
|
||||
if (timeFile.exists())
|
||||
testTask.Time = Double.parseDouble(Utils.ReadAllText(timeFile));
|
||||
if ((testTask instanceof TestRunTask) && stsFile.exists()) {
|
||||
TestRunTask testRunTask = (TestRunTask) testTask;
|
||||
testRunTask.statistic = FileUtils.readFileToString(stsFile);
|
||||
}
|
||||
if (stateFile.exists()) {
|
||||
String stateText = FileUtils.readFileToString(stateFile, Charset.defaultCharset()).replace("\n", "");
|
||||
testTask.state = TaskState.valueOf(stateText);
|
||||
@@ -319,3 +254,4 @@ public class TestsSupervisor_2022 {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user