迁移任务补好恢复逻辑
This commit is contained in:
+92
-5
@@ -1050,9 +1050,13 @@ class AdminWorkflowTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void uncertainMigrationIsNotRepeatedAfterRestartRecovery() throws Exception {
|
||||
JsonNode task = createImport();
|
||||
void lostMigrationResponseCanBeVerifiedAndResumedWithoutRepeatingMigration() throws Exception {
|
||||
enableOss();
|
||||
JsonNode signature = importUrdfSignature();
|
||||
storeUrdfFiles(signature);
|
||||
JsonNode task = request(signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), 202).path("data");
|
||||
String code = task.path("taskCode").asText();
|
||||
String projectCode = task.path("projectCode").asText();
|
||||
gitea.migrationTimeout = true;
|
||||
imports.run(code);
|
||||
imports.recover();
|
||||
@@ -1062,18 +1066,89 @@ class AdminWorkflowTest {
|
||||
.path("status")
|
||||
.asText())
|
||||
.isEqualTo("REVIEW");
|
||||
request(signed(post("/admin-api/project-imports/" + code + "/retry")), 409);
|
||||
JsonNode queued = request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202).path("data");
|
||||
assertThat(queued.path("phase").asText()).isEqualTo("VERIFYING");
|
||||
assertThat(gitea.migrations).isEqualTo(1);
|
||||
imports.run(code);
|
||||
assertThat(
|
||||
request(signed(get("/admin-api/project-imports/" + code)), 200)
|
||||
.path("data")
|
||||
.path("canRetry")
|
||||
.asBoolean())
|
||||
.isFalse();
|
||||
JsonNode recovered = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data");
|
||||
assertThat(recovered.path("status").asText()).isEqualTo("SUCCEEDED");
|
||||
assertThat(jdbc.queryForObject("SELECT receipt_json FROM project_import_task WHERE task_code=?", String.class, code))
|
||||
.isNotBlank();
|
||||
JsonNode project = request(signed(get("/admin-api/projects/" + projectCode)), 200).path("data").path("project");
|
||||
assertThat(project.path("publishStatus").asText()).isEqualTo("UNPUBLISHED");
|
||||
assertThat(project.path("urdfMainUrl").asText()).contains(signature.path("batchCode").asText());
|
||||
assertThat(writeState(projectCode)).isEqualTo("IDLE");
|
||||
imports.run(code);
|
||||
assertThat(gitea.migrations).isEqualTo(1);
|
||||
assertThat(gitea.deletions).isZero();
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@ValueSource(strings = {"marker", "source", "source-id", "owner", "name", "public", "mirror", "identity", "replaced", "empty", "read", "missing"})
|
||||
void unconfirmedMigrationTargetsStayInReviewWithoutWritingOrRemigrating(String fault) throws Exception {
|
||||
JsonNode task = createImport();
|
||||
String code = task.path("taskCode").asText();
|
||||
String projectCode = task.path("projectCode").asText();
|
||||
String name = "p_" + projectCode;
|
||||
gitea.migrationTimeout = true;
|
||||
imports.run(code);
|
||||
if (fault.equals("source-id")) SOURCES.incrementAndGet();
|
||||
com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository remote = gitea.inspect(name);
|
||||
if (fault.equals("marker")) gitea.migrationDescriptions.put(name, "vibemake-import:another-task");
|
||||
if (fault.equals("identity"))
|
||||
jdbc.update("UPDATE project SET gitea_repo_id=? WHERE project_code=?", remote.id() + 1, projectCode);
|
||||
gitea.replaceMigrationTargetAfterRead = fault.equals("replaced");
|
||||
gitea.failMigrationTargetRead = fault.equals("read");
|
||||
gitea.migrated.put(name, new com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository(
|
||||
remote.id(), fault.equals("owner") ? "other" : remote.owner(),
|
||||
fault.equals("name") ? "other" : remote.name(), !fault.equals("public"),
|
||||
fault.equals("mirror"), fault.equals("empty"),
|
||||
fault.equals("source") ? "https://github.com/example/other.git" : remote.originalUrl(), remote.defaultBranch()));
|
||||
if (fault.equals("missing")) gitea.migrated.remove(name);
|
||||
JsonNode before = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data");
|
||||
assertThat(before.path("canRetry").asBoolean()).isTrue();
|
||||
assertThat(before.path("retryMessage").asText()).contains("只读核验");
|
||||
request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202);
|
||||
imports.run(code);
|
||||
JsonNode after = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data");
|
||||
assertThat(after.path("status").asText()).isEqualTo("REVIEW");
|
||||
assertThat(after.path("phase").asText()).isEqualTo("VERIFYING");
|
||||
assertThat(jdbc.queryForObject("SELECT receipt_json FROM project_import_task WHERE task_code=?", String.class, code)).isNull();
|
||||
assertThat(writeState(projectCode)).isEqualTo("REVIEW");
|
||||
assertThat(gitea.migrations).isEqualTo(1);
|
||||
assertThat(gitea.deletions).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
void migrationStillInProgressCanBeVerifiedAgainOnceGiteaFinishes() throws Exception {
|
||||
JsonNode task = createImport();
|
||||
String code = task.path("taskCode").asText();
|
||||
String name = "p_" + task.path("projectCode").asText();
|
||||
gitea.migrationTimeout = true;
|
||||
imports.run(code);
|
||||
com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository finished = gitea.inspect(name);
|
||||
gitea.migrated.put(name, new com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository(
|
||||
finished.id(), finished.owner(), finished.name(), true, false, true, finished.originalUrl(), finished.defaultBranch()));
|
||||
request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202);
|
||||
imports.run(code);
|
||||
JsonNode pending = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data");
|
||||
assertThat(pending.path("errorCode").asText()).isEqualTo("MIGRATION_NOT_FINISHED");
|
||||
assertThat(pending.path("canRetry").asBoolean()).isTrue();
|
||||
gitea.migrated.put(name, finished);
|
||||
request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202);
|
||||
imports.run(code);
|
||||
assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200)
|
||||
.path("data").path("status").asText()).isEqualTo("SUCCEEDED");
|
||||
assertThat(gitea.migrations).isEqualTo(1);
|
||||
assertThat(gitea.deletions).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
void rejectedMigrationCleansOwnedRepositoryAndRetriesWithExistingAssets() throws Exception {
|
||||
enableOss();
|
||||
@@ -1390,7 +1465,7 @@ class AdminWorkflowTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void receiptPersistenceFailureCannotBeRetriedAsSuccessfulMigration() throws Exception {
|
||||
void recoveryReceiptPersistenceFailureKeepsReviewAndRollsBackRepositoryBinding() throws Exception {
|
||||
JsonNode task = createImport();
|
||||
String code = task.path("taskCode").asText();
|
||||
jdbc.execute("ALTER TABLE project_import_task ALTER COLUMN receipt_json VARCHAR(1)");
|
||||
@@ -1403,7 +1478,19 @@ class AdminWorkflowTest {
|
||||
assertThat(failed.getStatus()).isEqualTo("REVIEW");
|
||||
assertThat(failed.getReceiptJson()).isNull();
|
||||
assertThat(gitea.migrations).isEqualTo(1);
|
||||
request(signed(post("/admin-api/project-imports/" + code + "/retry")), 409);
|
||||
request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202);
|
||||
imports.run(code);
|
||||
assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200)
|
||||
.path("data").path("status").asText()).isEqualTo("REVIEW");
|
||||
assertThat(jdbc.queryForObject("SELECT gitea_repo_id FROM project WHERE project_code=?", Long.class,
|
||||
task.path("projectCode").asText())).isNull();
|
||||
assertThat(gitea.migrations).isEqualTo(1);
|
||||
assertThat(gitea.deletions).isZero();
|
||||
jdbc.execute("ALTER TABLE project_import_task ALTER COLUMN receipt_json TEXT");
|
||||
request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202);
|
||||
imports.run(code);
|
||||
assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200)
|
||||
.path("data").path("status").asText()).isEqualTo("SUCCEEDED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+14
-2
@@ -27,7 +27,7 @@ final class FakeGiteaClient implements GiteaClient {
|
||||
boolean deletionRejected;
|
||||
int deletions;
|
||||
boolean mainConflict;
|
||||
private final Map<String, RemoteRepository> migrated = new HashMap<>();
|
||||
final Map<String, RemoteRepository> migrated = new HashMap<>();
|
||||
private final Set<String> migrationNames = new HashSet<>();
|
||||
final Map<String, String> migrationDescriptions = new HashMap<>();
|
||||
private final Set<String> mainReady = new HashSet<>();
|
||||
@@ -40,6 +40,9 @@ final class FakeGiteaClient implements GiteaClient {
|
||||
boolean timeoutNextHead;
|
||||
boolean timeoutNextCreate;
|
||||
boolean failNextCreate;
|
||||
boolean failMigrationTargetRead;
|
||||
boolean replaceMigrationTargetAfterRead;
|
||||
int migrationTargetReads;
|
||||
|
||||
void reset() {
|
||||
repositories.clear();
|
||||
@@ -63,6 +66,9 @@ final class FakeGiteaClient implements GiteaClient {
|
||||
timeoutNextHead = false;
|
||||
timeoutNextCreate = false;
|
||||
failNextCreate = false;
|
||||
failMigrationTargetRead = false;
|
||||
replaceMigrationTargetAfterRead = false;
|
||||
migrationTargetReads = 0;
|
||||
}
|
||||
|
||||
private String sha() {
|
||||
@@ -229,7 +235,13 @@ final class FakeGiteaClient implements GiteaClient {
|
||||
|
||||
@Override
|
||||
public synchronized MigrationTarget inspectMigrationTarget(String name) {
|
||||
return new MigrationTarget(inspect(name), migrationDescriptions.get(name));
|
||||
if (failMigrationTargetRead)
|
||||
throw new GiteaFailure(504, "REMOTE_RESULT_UNKNOWN", "读取迁移目标超时", false);
|
||||
RemoteRepository remote = inspect(name);
|
||||
if (replaceMigrationTargetAfterRead && ++migrationTargetReads > 1)
|
||||
remote = new RemoteRepository(remote.id() + 1, remote.owner(), remote.name(), remote.privateRepo(),
|
||||
remote.mirror(), remote.empty(), remote.originalUrl(), remote.defaultBranch());
|
||||
return new MigrationTarget(remote, migrationDescriptions.get(name));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user