Skip to content

Fix synonyms IT tests #127207

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

Merged
merged 10 commits into from
Apr 23, 2025
Merged

Fix synonyms IT tests #127207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ccd79a
Fix synonyms IT tests
carlosdelest Apr 23, 2025
e334330
Reduce iterations
carlosdelest Apr 23, 2025
0b97e99
[CI] Auto commit changes from spotless
Apr 23, 2025
616f3c7
Remove Repeat annotation as it's forbidden
carlosdelest Apr 23, 2025
7487d16
Merge remote-tracking branch 'carlosdelest/tests/fix-synonyms-it' int…
carlosdelest Apr 23, 2025
bff1cf6
[CI] Auto commit changes from spotless
Apr 23, 2025
e7737b0
Remove repetitions
carlosdelest Apr 23, 2025
bfd7037
Merge remote-tracking branch 'carlosdelest/tests/fix-synonyms-it' int…
carlosdelest Apr 23, 2025
5744594
[CI] Auto commit changes from spotless
Apr 23, 2025
fcfddc4
Merge branch 'main' into tests/fix-synonyms-it
carlosdelest Apr 23, 2025
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
10 changes: 1 addition & 9 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,15 +438,7 @@ tests:
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderIT
method: testSearchWhileRelocating
issue: https://github.com/elastic/elasticsearch/issues/127188
- class: org.elasticsearch.synonyms.SynonymsManagementAPIServiceIT
method: testUpdateRuleWithMaxSynonyms
issue: https://github.com/elastic/elasticsearch/issues/127195
- class: org.elasticsearch.synonyms.SynonymsManagementAPIServiceIT
method: testCreateRuleWithMaxSynonyms
issue: https://github.com/elastic/elasticsearch/issues/127203
- class: org.elasticsearch.synonyms.SynonymsManagementAPIServiceIT
method: testTooManySynonymsOnIndexTriggersWarning
issue: https://github.com/elastic/elasticsearch/issues/127241


# Examples:
#
Expand Down
130 changes: 65 additions & 65 deletions ...c/internalClusterTest/java/org/elasticsearch/synonyms/SynonymsManagementAPIServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,73 +132,68 @@ public void testCreateTooManySynonymsUsingRuleUpdates() throws InterruptedExcept
int rulesToUpdate = randomIntBetween(1, 10);
int synonymsToCreate = maxSynonymSets - rulesToUpdate;
String synonymSetId = randomIdentifier();
synonymsManagementAPIService.putSynonymsSet(
synonymSetId,
randomSynonymsSet(synonymsToCreate),
randomBoolean(),
new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
// Create as many rules as should fail
SynonymRule[] rules = randomSynonymsSet(atLeast(rulesToUpdate + 1));
CountDownLatch updatedRulesLatch = new CountDownLatch(rulesToUpdate);
for (int i = 0; i < rulesToUpdate; i++) {
synonymsManagementAPIService.putSynonymRule(synonymSetId, rules[i], true, new ActionListener<>() {
synonymsManagementAPIService.putSynonymsSet(synonymSetId, randomSynonymsSet(synonymsToCreate), true, new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
// Create as many rules as should fail
SynonymRule[] rules = randomSynonymsSet(atLeast(rulesToUpdate + 1));
CountDownLatch updatedRulesLatch = new CountDownLatch(rulesToUpdate);
for (int i = 0; i < rulesToUpdate; i++) {
synonymsManagementAPIService.putSynonymRule(synonymSetId, rules[i], randomBoolean(), new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
updatedRulesLatch.countDown();
}

@Override
public void onFailure(Exception e) {
fail(e);
}
});
}
try {
updatedRulesLatch.await(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
fail(e);
}

// Updating more rules fails
int rulesToInsert = rules.length - rulesToUpdate;
CountDownLatch insertRulesLatch = new CountDownLatch(rulesToInsert);
for (int i = rulesToUpdate; i < rulesToInsert; i++) {
synonymsManagementAPIService.putSynonymRule(
// Error here
synonymSetId,
rules[i],
randomBoolean(),
new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
updatedRulesLatch.countDown();
fail("Shouldn't have been able to update a rule");
}

@Override
public void onFailure(Exception e) {
fail(e);
}
});
}
try {
updatedRulesLatch.await(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
fail(e);
}

// Updating more rules fails
int rulesToInsert = rules.length - rulesToUpdate;
CountDownLatch insertRulesLatch = new CountDownLatch(rulesToInsert);
for (int i = rulesToUpdate; i < rulesToInsert; i++) {
synonymsManagementAPIService.putSynonymRule(
// Error here
synonymSetId,
rules[i],
randomBoolean(),
new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
fail("Shouldn't have been able to update a rule");
}

@Override
public void onFailure(Exception e) {
if (e instanceof IllegalArgumentException == false) {
fail(e);
}
updatedRulesLatch.countDown();
if (e instanceof IllegalArgumentException == false) {
fail(e);
}
updatedRulesLatch.countDown();
}
);
}
try {
insertRulesLatch.await(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
fail(e);
}
}
);
}

@Override
public void onFailure(Exception e) {
try {
insertRulesLatch.await(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
fail(e);
}
}
);

@Override
public void onFailure(Exception e) {
fail(e);
}
});

latch.await(5, TimeUnit.SECONDS);
}
Expand Down Expand Up @@ -243,21 +238,26 @@ public void testCreateRuleWithMaxSynonyms() throws InterruptedException {
String synonymSetId = randomIdentifier();
String ruleId = randomIdentifier();
SynonymRule[] synonymsSet = randomSynonymsSet(maxSynonymSets, maxSynonymSets);
synonymsManagementAPIService.putSynonymsSet(synonymSetId, synonymsSet, randomBoolean(), new ActionListener<>() {
synonymsManagementAPIService.putSynonymsSet(synonymSetId, synonymsSet, true, new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
// Updating a rule fails
synonymsManagementAPIService.putSynonymRule(synonymSetId, randomSynonymRule(ruleId), true, new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
fail("Should not create a new rule that does not exist when at max capacity");
}
synonymsManagementAPIService.putSynonymRule(
synonymSetId,
randomSynonymRule(ruleId),
randomBoolean(),
new ActionListener<>() {
@Override
public void onResponse(SynonymsManagementAPIService.SynonymsReloadResult synonymsReloadResult) {
fail("Should not create a new rule that does not exist when at max capacity");
}

@Override
public void onFailure(Exception e) {
latch.countDown();
@Override
public void onFailure(Exception e) {
latch.countDown();
}
}
});
);
}

@Override
Expand Down