Vivek1106-04 commented on PR #12165: URL: https://github.com/apache/seatunnel/pull/12165#issuecomment-6539202314
@SEZ9 @DanielLeens I merged the latest `dev` (`3ac2d1cec`) into the branch. The new head is `b48e21019`, and GitHub now reports the PR as mergeable. The conflicts came from #12042 (idle reader state after a master switch), which touched the same two files: - `CheckpointCoordinator`: an import block conflict only. I kept both sides (`PipelineCheckpointScheduler` from this PR, and `ExecutionState` / `TaskGroupLocation` from dev). No code bodies conflicted. - `CheckpointCoordinatorTest`: two additions in the same spot (this PR's shared-scheduler test helpers, and dev's new `testRunningRestoreCompletesCheckpointWithoutFinishedReaderAcknowledgements`). I kept both. Dev's test built its coordinator on a plain `Mockito.mock(CheckpointManager.class)`, which returns a null scheduler lease on this branch. That is the same semantic conflict as the earlier #12448 one, so the test now uses the existing `mockCheckpointManager()` helper. Nothing else in the test changed. Local, JDK 17, `org.apache.seatunnel.engine.server.checkpoint.**` and `dag.physical.**`: 109 run, 0 failures, 0 errors, 2 skipped (pre-existing `@Disabled`). This includes `CheckpointCoordinatorTest` 21/21, with dev's new idle-reader test passing, and `SharedCheckpointSchedulerTest` 11/11. `spotless:check` is clean. Fork Build for `b48e21019`: https://github.com/Vivek1106-04/seatunnel/actions/runs/41170040575 (running). I will post the result here. -- 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]
