Detect serverless operator status automatically #1768
Conversation
pquentin
added
enhancement
esrally/client/factory.py
Outdated
| @@ -346,7 +347,16 @@ def cluster_distribution_version(hosts, client_options, client_factory=EsClientF | |||
| # version number does not exist for serverless | |||
| version_number = version.get("number", version_build_flavor) | |||
|
|
|||
| return version_build_flavor, version_number, version_build_hash | |||
| serverless_operator = False | |||
| if version_build_flavor == "serverless": | |||
There was a problem hiding this comment.
Can we use the is_serverless helper function for this?
rally/esrally/utils/versions.py
Lines 36 to 37 in b0b5e05
esrally/client/factory.py
Outdated
| authentication_info = es.perform_request(method="GET", path="/_security/_authenticate") | ||
| serverless_operator = authentication_info.body.get("operator", False) | ||
|
|
||
| if not version_build_flavor == "serverless" or serverless_operator is True: |
There was a problem hiding this comment.
| # unconditionally wait for the REST layer - if it's not up by then, we'll intentionally raise the original error | ||
| wait_for_rest_layer(es) | ||
|
|
||
| # wait_for_rest_layer calls the Cluster Health API, which is not available for unprivileged users on Serverless |
There was a problem hiding this comment.
Can we please update the docstring to include the new serverless_operator return value?
Well this is definitely quite ugly. I want to use a single Elasticsearch client here but did not want to affect the stateful uses of this function too much. This is the best compromise I found. However, if we think the logic of this function is fine, then I'm not convinced separating it into other functions would have helped that much. The logic is complicated but 20 lines is not that much in my opinion, even though Uncle Bob would disagree. |
I agree, no need for any changes. |
This can be tested like #1760, but you no longer need to explicitly set the operator status in rally.ini, instead it should be detected automatically.