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

Added runners for enabling concurrent segment search via settings #591

Merged
merged 3 commits into from
Jul 29, 2024
+83 −0
Merged

Added runners for enabling concurrent segment search via settings #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08db823
Adding operation for enabling concurrent segment search
martin-gaievski Jul 23, 2024
d25b145
Fixed lint errors, made setting persistent
martin-gaievski Jul 23, 2024
41b0429
Generalized to update settings and added max slice param
martin-gaievski Jul 23, 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
19 changes: 19 additions & 0 deletions osbenchmark/worker_coordinator/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ def register_default_runners():
register_runner(workload.OperationType.DeployMlModel, Retry(DeployMlModel()), async_runner=True)
register_runner(workload.OperationType.TrainKnnModel, Retry(TrainKnnModel()), async_runner=True)
register_runner(workload.OperationType.DeleteKnnModel, Retry(DeleteKnnModel()), async_runner=True)
register_runner(workload.OperationType.UpdateConcurrentSegmentSearchSettings,
Retry(UpdateConcurrentSegmentSearchSettings()), async_runner=True)

def runner_for(operation_type):
try:
Expand Down Expand Up @@ -2696,3 +2698,20 @@ async def __call__(self, opensearch, params):

def __repr__(self, *args, **kwargs):
return "deploy-ml-model"

class UpdateConcurrentSegmentSearchSettings(Runner):
@time_func
async def __call__(self, opensearch, params):
enable_setting = params.get("enable", "false")
max_slice_count = params.get("max_slice_count", None)
body = {
"persistent": {
"search.concurrent_segment_search.enabled": enable_setting
}
}
if max_slice_count is not None:
body["persistent"]["search.concurrent_segment_search.max_slice_count"] = max_slice_count
await opensearch.cluster.put_settings(body=body)

def __repr__(self, *args, **kwargs):
return "update-concurrent-segment-search-settings"
3 changes: 3 additions & 0 deletions osbenchmark/workload/workload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ class OperationType(Enum):
DeleteMlModel = 1041
RegisterMlModel = 1042
DeployMlModel = 1043
UpdateConcurrentSegmentSearchSettings = 1044

@property
def admin_op(self):
Expand Down Expand Up @@ -752,6 +753,8 @@ def from_hyphenated_string(cls, v):
return OperationType.TrainKnnModel
elif v == "delete-knn-model":
return OperationType.DeleteKnnModel
elif v == "update-concurrent-segment-search-settings":
return OperationType.UpdateConcurrentSegmentSearchSettings
else:
raise KeyError(f"No enum value for [{v}]")

Expand Down
61 changes: 61 additions & 0 deletions tests/worker_coordinator/runner_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6785,3 +6785,64 @@ async def test_param_id_mandatory(self, opensearch, on_client_request_start, on_
await r(opensearch, params)

self.assertEqual(0, opensearch.transport.perform_request.call_count)

class UpdateConcurrentSegmentSearchSettingsTests(TestCase):
@mock.patch('osbenchmark.client.RequestContextHolder.on_client_request_end')
@mock.patch('osbenchmark.client.RequestContextHolder.on_client_request_start')
@mock.patch("opensearchpy.OpenSearch")
@run_async
async def test_enable_concurrent_segment_search(self, opensearch, on_client_request_start, on_client_request_end):
opensearch.cluster.put_settings.return_value = as_future()
params = {
"enable": "true"
}

r = runner.UpdateConcurrentSegmentSearchSettings()
await r(opensearch, params)

opensearch.cluster.put_settings.assert_called_once_with(body={
"persistent": {
"search.concurrent_segment_search.enabled": "true"
}
})

@mock.patch('osbenchmark.client.RequestContextHolder.on_client_request_end')
@mock.patch('osbenchmark.client.RequestContextHolder.on_client_request_start')
@mock.patch("opensearchpy.OpenSearch")
@run_async
async def test_max_slice_count(self, opensearch, on_client_request_start, on_client_request_end):
opensearch.cluster.put_settings.return_value = as_future()
params = {
"max_slice_count": 2
}

r = runner.UpdateConcurrentSegmentSearchSettings()
await r(opensearch, params)

opensearch.cluster.put_settings.assert_called_once_with(body={
"persistent": {
"search.concurrent_segment_search.enabled": "false",
"search.concurrent_segment_search.max_slice_count": 2
}
})

@mock.patch('osbenchmark.client.RequestContextHolder.on_client_request_end')
@mock.patch('osbenchmark.client.RequestContextHolder.on_client_request_start')
@mock.patch("opensearchpy.OpenSearch")
@run_async
async def test_concurrent_segment_search_settings(self, opensearch, on_client_request_start, on_client_request_end):
opensearch.cluster.put_settings.return_value = as_future()
params = {
"enable": "true",
"max_slice_count": 2
}

r = runner.UpdateConcurrentSegmentSearchSettings()
await r(opensearch, params)

opensearch.cluster.put_settings.assert_called_once_with(body={
"persistent": {
"search.concurrent_segment_search.enabled": "true",
"search.concurrent_segment_search.max_slice_count": 2
}
})
Loading