Skip to content

[#1305] Wait for replication generation IDs to converge - #1306

Merged
vharseko merged 1 commit into
OpenIdentityPlatform:masterfrom
vharseko:fix/1305-reset-generation-id-convergence
Nov 18, 2026
Merged

vharseko merged 1 commit into
OpenIdentityPlatform:masterfrom
vharseko:fix/1305-reset-generation-id-convergence

Conversation

@vharseko

Copy link
Copy Markdown
Member

Problem

ReplicationDomainTest.publishAndReceive checks the replication server generation IDs 500 ms after resetting the replication log. The reset and the resulting topology messages are asynchronous, and checkGenerationID() accepts -1, so the check can still see -1 even though the reset to 2 is in progress.

Change

Wait up to 30 seconds for both expected replication servers to appear in the directory server's topology with generation ID 2, and for both replication servers to hold 2 themselves. A missing server or a generation ID that never converges still fails the test.

Fixes #1305

Validation

  • ReplicationDomainTest: 40 tests passed on macOS / JDK 21, with no failures or skips.
  • A temporary diagnostic delayed the handling of reset to 2 by 1.5 seconds. The original 500 ms check reproduced the reported failure; the updated test passed after the reset and topology converged.
  • A temporary diagnostic discarded reset to 2. The updated test failed after the bounded wait with the generation ID still at -1.
  • git diff --check passed.

The diagnostics demonstrate a sufficient timing mechanism, not the exact CI interleaving.

@vharseko vharseko added bug CI replication tests Test suites: fixing, enabling, un-disabling labels Nov 17, 2026
@vharseko
vharseko requested a review from maximthomas November 17, 2026 17:19
@vharseko
vharseko merged commit e0e1e42 into OpenIdentityPlatform:master Nov 18, 2026
28 of 45 checks passed
@vharseko
vharseko deleted the fix/1305-reset-generation-id-convergence branch November 18, 2026 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug CI replication tests Test suites: fixing, enabling, un-disabling

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Investigate generation ID mismatch after replication log reset in CI

2 participants