Skip to content

Wait for the renamed entry before reading the naming conflict monitor #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vharseko wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Open

Wait for the renamed entry before reading the naming conflict monitor #895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,11 @@ public void namingConflicts() throws Exception

assertNull(getEntry(personWithUUIDEntry.getName(), 10000, false),
"The DELETE replication message was not replayed");
assertNull(getEntry(personWithSecondUniqueID.getName(), 10000, false),
// The second entry was created with the same DN as the first one, so waiting
// on that DN again returns as soon as the first delete is replayed. Wait on
// the DN the naming conflict renamed it to instead: the second delete then
// has resolved its conflict, and counted it, before the monitor is read below.
assertNull(getEntry(dn2, 10000, false),
"The DELETE replication message was not replayed");
/*
* Check that and added entry is correctly added below it's
Expand Down
Loading