Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/app/core/dispatcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ class Dispatcher extends EventEmitter {
try {
if (target.state === "finished") {
getLogger(this.projectRootDir).info(`finished component don't re-run at this time: ${target.name}(${target.ID})`);
await this._addNextComponent(target);
} else {
await this._cmdFactory(target.type).call(this, target);
}
Expand Down
2 changes: 1 addition & 1 deletion server/app/db/version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version": "2026-0312-203109" }
{"version": "2026-0316-150937" }
38 changes: 38 additions & 0 deletions server/test/app/core/restart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
const path = require("path");
const fs = require("fs-extra");
const tar = require("tar");
const { EventEmitter } = require("events");

//setup test framework
const chai = require("chai");
Expand All @@ -16,6 +17,8 @@ chai.use(require("chai-fs"));

//testee
const { runProject } = require("../../../app/core/projectController.js");
const { statusFilename } = require("../../../app/db/db.js");
const { eventEmitters } = require("../../../app/core/global.js");

//test data
const testDirRoot = "WHEEL_TEST_TMP";
Expand Down Expand Up @@ -159,6 +162,41 @@ describe("restart UT", function () {
expect(path.resolve(projectRootDir, "PS0/15_hoge.txt")).to.be.a.file().with.contents.that.match(/PS0_time_15\/task0/);
expect(path.resolve(projectRootDir, "PS0/20_hoge.txt")).to.be.a.file().with.contents.that.match(/PS0_time_20\/task0/);
});
it("can restart and skip already finished component while completing remaining tasks with dependency", async ()=>{
await tar.x({
file: path.resolve(testFileDir, "restart_with_dependency.tgz"),
preserveOwner: false,
cwd: projectRootDir
});
const projectDir = path.resolve(projectRootDir, "restart_with_dependency.wheel");

const ee = new EventEmitter();
eventEmitters.set(projectDir, ee);

try {
await runProject(projectDir);
} finally {
eventEmitters.delete(projectDir);
}

//task0 must not run again: state stays "finished" and no dispatchedTime is added
const task0Json = await fs.readJson(path.resolve(projectDir, "task0/cmp.wheel.json"));
expect(task0Json.state).to.equal("finished");
expect(task0Json.dispatchedTime).to.be.undefined;

//task1 must finish
const task1Json = await fs.readJson(path.resolve(projectDir, "task1/cmp.wheel.json"));
expect(task1Json.state).to.equal("finished");

//task2 must finish
const task2Json = await fs.readJson(path.resolve(projectDir, "task2/cmp.wheel.json"));
expect(task2Json.state).to.equal("finished");

//task2's output: status file must exist and report successful execution
expect(path.resolve(projectDir, `task2/${statusFilename}`))
.to.be.a.file()
.with.contents.that.match(/^finished\n0/);
});
it("can restart PS component and re-run only not finished instances", async ()=>{
await tar.x({
file: path.resolve(testFileDir, "restart_PS_stop_before_actual_run.tgz"),
Expand Down
Binary file added server/test/testFiles/restart_with_dependency.tgz
Binary file not shown.
Loading