Add max_resource_units to enterprise license #50735

tvernum · 2020-01-08T11:25:38Z

The enterprise license type must has "max_resource_units" and may not
have "max_nodes".

This change adds support for this new field, validation that the field
is present if-and-only-if the license is enterprise and bumps the
license version number to reflect the new field.

The enterprise license type must has "max_resource_units" and may not have "max_nodes". This change adds support for this new field, validation that the field is present if-and-only-if the license is enterprise and bumps the license version number to reflect the new field.

elasticmachine · 2020-01-08T11:25:40Z

Pinging @elastic/es-security (:Security/License)

jkakavas

LGTM

jkakavas · 2020-01-09T08:31:05Z

x-pack/plugin/core/src/main/java/org/elasticsearch/license/License.java

+    private static void validateLimits(String type, int maxNodes, int maxResourceUnits) {
+        if (LicenseType.isEnterprise(type)) {
+            if (maxResourceUnits == -1) {
+                throw new IllegalStateException("maxResourceUnits must be set for enterprise licenses");


nit:

Suggested change

throw new IllegalStateException("maxResourceUnits must be set for enterprise licenses");

throw new IllegalStateException("maxResourceUnits must be set for license type [" + type + "]");

jkakavas · 2020-01-09T08:31:51Z

x-pack/plugin/core/src/main/java/org/elasticsearch/license/License.java

+            if (maxResourceUnits == -1) {
+                throw new IllegalStateException("maxResourceUnits must be set for enterprise licenses");
+            } else if (maxNodes != -1) {
+                throw new IllegalStateException("maxNodes may not be set for enterprise licenses");


Suggested change

throw new IllegalStateException("maxNodes may not be set for enterprise licenses");

throw new IllegalStateException("maxNodes may not be set license type [" + type + "]");

jkakavas · 2020-01-09T08:32:11Z

x-pack/plugin/core/src/main/java/org/elasticsearch/license/License.java

+            if (maxNodes == -1) {
+                throw new IllegalStateException("maxNodes has to be set");
+            } else if (maxResourceUnits != -1) {
+                throw new IllegalStateException("maxResourceUnits may only be set for enterprise licenses");


Suggested change

throw new IllegalStateException("maxResourceUnits may only be set for enterprise licenses");

throw new IllegalStateException("maxResourceUnits may only be set license type [" + type + "]");

This suggestion is backwards. I could change it to say that they "may not be set for license type [" + type + "]", but it seemed more helpful to explain when they are permitted than to just reject them for the current type.

Sure, makes sense, sorry for the half-baked suggestion

tvernum · 2020-01-13T05:36:29Z

@jkakavas I pushed fbfe58c to update the error messages. Do the new messages seem OK to you?

jkakavas

LGTM

The enterprise license type must have "max_resource_units" and may not have "max_nodes". This change adds support for this new field, validation that the field is present if-and-only-if the license is enterprise and bumps the license version number to reflect the new field. Includes a BWC layer to return "max_nodes: ${max_resource_units}" in the GET license API. Backport of: elastic#50735

The enterprise license type must have "max_resource_units" and may not have "max_nodes". This change adds support for this new field, validation that the field is present if-and-only-if the license is enterprise and bumps the license version number to reflect the new field. Includes a BWC layer to return "max_nodes: ${max_resource_units}" in the GET license API. Backport of: #50735

The enterprise license type must has "max_resource_units" and may not have "max_nodes". This change adds support for this new field, validation that the field is present if-and-only-if the license is enterprise and bumps the license version number to reflect the new field.

six5532one · 2020-01-23T17:10:44Z

@tvernum I'd like to test that ECE can install this version of the enterprise license on clusters that support it. Is this version of the stack license supported on any 7.6 snapshot, or is there a specific tagged stack version I need to use for testing?

Relates: #4341, elastic/elasticsearch#49223, elastic/elasticsearch#50735 This commit adds support for Enterprise LicenseType, and adds max_resource_units to GetLicenseResponse.

Relates: #4341, elastic/elasticsearch#49223, elastic/elasticsearch#50735 This commit adds support for Enterprise LicenseType, and adds max_resource_units to GetLicenseResponse. Co-authored-by: Russ Cam <russ.cam@elastic.co>

Relates: #4341, elastic/elasticsearch#49223, elastic/elasticsearch#50735 This commit adds support for Enterprise LicenseType, and adds max_resource_units to GetLicenseResponse. (cherry picked from commit c737df6)

…es (#75479) in #50067 for _license the accept_enterprise = false was no longer supported. This commit allows it under rest compatibility and is showing enterprise licenses as platinum The same change had to be applied to _xpack endpoint #58217 in #50735 max_resource_units was introduced to be more accurate. For v7 requests, which do not know about enterprise license we will return max_node which will be set from max_resource_units (it assumes that one resource unit is 32GB - which corresponds to 1 node) relates #51816

…es (elastic#75479) in elastic#50067 for _license the accept_enterprise = false was no longer supported. This commit allows it under rest compatibility and is showing enterprise licenses as platinum The same change had to be applied to _xpack endpoint elastic#58217 in elastic#50735 max_resource_units was introduced to be more accurate. For v7 requests, which do not know about enterprise license we will return max_node which will be set from max_resource_units (it assumes that one resource unit is 32GB - which corresponds to 1 node) relates elastic#51816

tvernum added >enhancement :Security/License License functionality for commercial features v8.0.0 v7.6.0 labels Jan 8, 2020

tvernum requested a review from jkakavas January 8, 2020 11:25

tvernum added 6 commits January 9, 2020 11:31

Fix compatible license versions

0bcba71

Merge branch 'master' into enterprise-license/max_resource_units

7a26ca3

Fix some tests

3019233

Merge branch 'master' into enterprise-license/max_resource_units

0c03b5c

Add max_resource_units to monitoring test

8147c82

Fix docs snippet

1cfc630

jkakavas approved these changes Jan 9, 2020

View reviewed changes

tvernum added 5 commits January 13, 2020 13:59

Update Rest tests

736057a

Merge branch 'master' into enterprise-license/max_resource_units

f3c54d6

Fix self generated (trial) enterprise licenses

c7e537d

Fix another broken test

a02c11d

Update validation messages

fbfe58c

tvernum requested a review from jkakavas January 13, 2020 06:15

jkakavas approved these changes Jan 13, 2020

View reviewed changes

tvernum merged commit 8727f27 into elastic:master Jan 13, 2020

tvernum added the backport pending label Jan 13, 2020

tvernum mentioned this pull request Jan 13, 2020

[Backport 7.x] Add max_resource_units to enterprise license #50910

Merged

tvernum removed the backport pending label Jan 14, 2020

pebrc mentioned this pull request Jan 17, 2020

Fix License model in Elasticsearch client for 7.6 elastic/cloud-on-k8s#2441

Merged

This was referenced Feb 3, 2020

[meta] 7.6 release elastic/elasticsearch-net#4340

Closed

[meta] 7.6 release elastic/elasticsearch-net#4341

Closed

russcam mentioned this pull request Feb 21, 2020

Support Enterprise license type elastic/elasticsearch-net#4406

Merged

pgomulka mentioned this pull request Jul 20, 2021

[Rest Api Compatibility] Licence accept_enterprise and response changes #75479

Merged

jakelandis added v8.0.0-alpha1 and removed v8.0.0 labels Jul 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add max_resource_units to enterprise license #50735

Add max_resource_units to enterprise license #50735

tvernum commented Jan 8, 2020

elasticmachine commented Jan 8, 2020

jkakavas left a comment

jkakavas Jan 9, 2020

jkakavas Jan 9, 2020

jkakavas Jan 9, 2020

tvernum Jan 13, 2020

jkakavas Jan 13, 2020

tvernum commented Jan 13, 2020

jkakavas left a comment

six5532one commented Jan 23, 2020

	throw new IllegalStateException("maxResourceUnits must be set for enterprise licenses");
	throw new IllegalStateException("maxResourceUnits must be set for license type [" + type + "]");

	throw new IllegalStateException("maxNodes may not be set for enterprise licenses");
	throw new IllegalStateException("maxNodes may not be set license type [" + type + "]");

Add max_resource_units to enterprise license #50735

Add max_resource_units to enterprise license #50735

Conversation

tvernum commented Jan 8, 2020

elasticmachine commented Jan 8, 2020

jkakavas left a comment

Choose a reason for hiding this comment

jkakavas Jan 9, 2020

Choose a reason for hiding this comment

jkakavas Jan 9, 2020

Choose a reason for hiding this comment

jkakavas Jan 9, 2020

Choose a reason for hiding this comment

tvernum Jan 13, 2020

Choose a reason for hiding this comment

jkakavas Jan 13, 2020

Choose a reason for hiding this comment

tvernum commented Jan 13, 2020

jkakavas left a comment

Choose a reason for hiding this comment

six5532one commented Jan 23, 2020