Do not stop running trial even when ECK is not in trial mode #3150
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Trials on Elasticsearch level can only be started once. The intention behind this change is avoid a bad user experience. We encourage users to start trials via ECK but the Kibana UI also advertises trials in various places when users try to access commercial features. We don't want to change the Kibana behaviour to keep this easy way to try out a feature. This change therefore tolerates a cluster running in trial mode even if ECK's license level would require us to downgrade this cluster to a Basic license.
sebgl
added a commit
that referenced
this pull request
May 29, 2020
) Fixes #3163. Fixes a bug introduced in #3150. We used to rely on the license fetched by the observers on a regular basis, but this can lead to a race condition as described in #3163 (comment). Instead, let's keep things simple, and do a synchronous request to get the license as part of the normal reconciliation, to then decide whether or not it should be updated. In case of error (eg. Elasticsearch req timeout), enqueue a new reconciliation, but don't abort the current reconciliation. This PR also adds some minor refactoring of the code, and avoids a call to start_basic if the current license is already basic.
charith-elastic
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trials on Elasticsearch level can only be started once.
The intention behind this change is to avoid a bad user experience.
We encourage users to start trials via ECK but the Kibana UI also
advertises trials in various places when users try to access commercial features.
We don't want to change the Kibana behaviour to keep this easy way to try out a feature.
This change therefore tolerates a cluster running in trial mode even if ECK's license level
would require us to downgrade this cluster to a Basic license.
Fixes #3141