DanielLeens commented on PR #11856: URL: https://github.com/apache/seatunnel/pull/11856#issuecomment-6538592838
Merged `dev` (`3ac2d1cec6a`) into this branch with a plain merge commit (no rebase, no force push). New head: `408723b36e2` (previous head `eed3d9f2f4`). Only formatting was run locally (module-scoped `spotless:apply`); `git diff origin/dev --name-status` lists only this PR's own 11 files and no deletions. Conflicts and resolution: - `deployment-seatunnel-master.yaml`, `deployment-seatunnel-worker.yaml`, `seatunnel-cluster.sh`: `dev` (#12710) already switched the foreground start to `exec java` and the K8s command to exec form, which is the same intent as this PR's launch-path bullet. Took `dev`'s version, so these three files no longer differ from `dev`. As a consequence this PR's own string-matching `testClusterScriptExecsForegroundServer` in `SeaTunnelClusterScriptTest.java` was dropped: `dev`'s `testClusterScriptExecsServerJvmInForeground` already asserts the same behaviour (JVM parent pid equals the script pid) and is stricter. - `PhysicalVertexTest.java` (add/add): `dev` (#12042) added a test class with the same name. Merged into one class: `dev`'s six tests and helpers are unchanged, this PR's graceful-removal tests and helpers are appended, and the class Javadoc covers both. - `CoordinatorService.java`, `SeaTunnelServer.java`, `PhysicalVertex.java`, `ClusterFaultToleranceIT.java` and both state-storage-and-recovery docs merged without textual conflict. I re-read the merged `restoreAllRunningJobFromMasterNodeSwitch` path: the `restoringRunningJobsFromMasterSwitch` try/finally reset and `dev`'s zombie pre-filter are both intact; the `initCoordinatorService()` reset is intact. Compile and tests are left to the fork CI run per the validation policy (queued at the time of writing, no result claimed): https://github.com/DanielLeens/seatunnel/actions/runs/41165429981 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
