Skip to content
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

Add validation for the search backpressure cancellation settings #15501

Merged
merged 10 commits into from
Sep 17, 2024
Merged

Add validation for the search backpressure cancellation settings #15501

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
adcf328
Fix updating search backpressure settings crashing the cluster
gaobinlong Aug 29, 2024
f518b2e
Modify change log
gaobinlong Aug 29, 2024
16d728b
Merge remote-tracking branch 'upstream/main' into fix_bug
gaobinlong Aug 30, 2024
3dd592e
Fix version check
gaobinlong Aug 30, 2024
5dfd90c
merge main
gaobinlong Aug 30, 2024
c0033ec
Increase test coverage
gaobinlong Aug 30, 2024
f39e5e8
Format the code
gaobinlong Aug 30, 2024
e016a42
Optimize some code
gaobinlong Aug 30, 2024
03b13b3
Fix typo
gaobinlong Aug 30, 2024
575303c
Add change log
gaobinlong Sep 14, 2024
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
Prev Previous commit
Next Next commit
Format the code 
Signed-off-by: Gao Binlong <gbinlong@amazon.com>
  • Loading branch information
@gaobinlong
gaobinlong committed Aug 30, 2024
commit f39e5e8f62ebd0edbc006bd25cf7d3f70659d361
8 changes: 4 additions & 4 deletions ...est/java/org/opensearch/search/backpressure/settings/SearchBackpressureSettingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,27 @@ public void testSearchBackpressureSettingValidateInvalidMode() {
}

public void testInvalidCancellationRate() {
Settings settings1 = Settings.builder().put("search_backpressure.search_task.cancellation_rate", randomFrom(-1,0)).build();
Settings settings1 = Settings.builder().put("search_backpressure.search_task.cancellation_rate", randomFrom(-1, 0)).build();
assertThrows(
IllegalArgumentException.class,
() -> new SearchBackpressureSettings(settings1, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS))
);

Settings settings2 = Settings.builder().put("search_backpressure.search_shard_task.cancellation_rate", randomFrom(-1,0)).build();
Settings settings2 = Settings.builder().put("search_backpressure.search_shard_task.cancellation_rate", randomFrom(-1, 0)).build();
assertThrows(
IllegalArgumentException.class,
() -> new SearchBackpressureSettings(settings2, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS))
);
}

public void testInvalidCancellationRatio() {
Settings settings1 = Settings.builder().put("search_backpressure.search_task.cancellation_ratio", randomFrom(-1,0)).build();
Settings settings1 = Settings.builder().put("search_backpressure.search_task.cancellation_ratio", randomFrom(-1, 0)).build();
assertThrows(
IllegalArgumentException.class,
() -> new SearchBackpressureSettings(settings1, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS))
);

Settings settings2 = Settings.builder().put("search_backpressure.search_shard_task.cancellation_ratio", randomFrom(-1,0)).build();
Settings settings2 = Settings.builder().put("search_backpressure.search_shard_task.cancellation_ratio", randomFrom(-1, 0)).build();
assertThrows(
IllegalArgumentException.class,
() -> new SearchBackpressureSettings(settings2, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS))
Expand Down
Loading