diff --git a/osbenchmark/worker_coordinator/runner.py b/osbenchmark/worker_coordinator/runner.py index d280ddffd..90330be54 100644 --- a/osbenchmark/worker_coordinator/runner.py +++ b/osbenchmark/worker_coordinator/runner.py @@ -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: @@ -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" diff --git a/osbenchmark/workload/workload.py b/osbenchmark/workload/workload.py index 95545fb59..848cb5b3b 100644 --- a/osbenchmark/workload/workload.py +++ b/osbenchmark/workload/workload.py @@ -635,6 +635,7 @@ class OperationType(Enum): DeleteMlModel = 1041 RegisterMlModel = 1042 DeployMlModel = 1043 + UpdateConcurrentSegmentSearchSettings = 1044 @property def admin_op(self): @@ -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}]") diff --git a/tests/worker_coordinator/runner_test.py b/tests/worker_coordinator/runner_test.py index 4f4b303b2..a48bbb82c 100644 --- a/tests/worker_coordinator/runner_test.py +++ b/tests/worker_coordinator/runner_test.py @@ -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 + } + })