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.

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

Override serverless cluster version #1818

Merged
merged 1 commit into from
Jan 8, 2024

Conversation

gbanasiak
Copy link
Contributor

@gbanasiak gbanasiak commented Jan 5, 2024

Early Elastic Serverless versions returned no version.number and no version.build_hash fields under root API endpoint (/). Initial Rally adjustment for Serverless had taken this into account, see #1738.

Later, due to BWC with clients, version.number and version.build_hash returned in static/pinned form.

{
	"name": "serverless",
	"cluster_name": "e4ba38a16a19425e9eac79c868c2afc5",
	"cluster_uuid": "btqR_bqJTPqvbV4Rgn_Z5Q",
	"version": {
		"number": "8.11.0", <--- HERE
		"build_flavor": "serverless",
		"build_type": "docker",
		"build_hash": "00000000", <--- HERE
		"build_date": "2023-10-31",
		"build_snapshot": false,
		"lucene_version": "9.7.0",
		"minimum_wire_compatibility_version": "8.11.0",
		"minimum_index_compatibility_version": "8.11.0"
	},
	"tagline": "You Know, for Search"
}

To address dummy build hash, when running with operator privileges the actual build hash is retrieved using nodes info API (see #1756). The version number, however, remains at 8.11.0. As a consequence, Rally checks out 8.11.0 Rally track branch which is fine today as it's kept in sync with master, but does not allow us to move to a newer track branch.

This PR restores the original concept of reporting the version of serverless when run against Elastic Serverless clusters. With serverless version, Rally track branch selection defaults to master, see here:

elif is_serverless(distribution_version):
return "master"

@gbanasiak gbanasiak requested a review from a team January 5, 2024 15:35
@gbanasiak gbanasiak marked this pull request as ready for review January 5, 2024 15:35
Copy link
Member

@gareth-ellis gareth-ellis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gbanasiak gbanasiak merged commit df49d4d into elastic:master Jan 8, 2024
15 checks passed
@gbanasiak gbanasiak deleted the override-serverless-version branch January 8, 2024 12:28
gbanasiak added a commit that referenced this pull request Jan 10, 2024
Changes telemetry to report `serverless` version instead of `8.11.0`
version in case of Elastic Serverless clusters. This aligns telemetry
output with #1818.
@gareth-ellis gareth-ellis added this to the 2.11 milestone May 23, 2024
@gareth-ellis gareth-ellis added the enhancement Improves the status quo label May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improves the status quo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants