[HZ-820] Persist license key and support configuration update #20446
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
ramizdundar
requested review from
frant-hartm
and removed request for
frant-hartm
ramizdundar
added
Add to Release Notes
Module: Config
Source: Internal
ramizdundar
changed the title
ramizdundar
changed the title
vbekiaris
requested changes
Jan 24, 2022
hazelcast/src/main/java/com/hazelcast/internal/config/AbstractConfigLocator.java
Outdated
Show resolved
Hide resolved
...cast/src/main/java/com/hazelcast/internal/dynamicconfig/ClusterWideConfigurationService.java
Outdated
Show resolved
Hide resolved
...lcast/src/test/java/com/hazelcast/internal/config/dynamic/DynamicConfigXmlGeneratorTest.java
Outdated
Show resolved
Hide resolved
Now users can reload from default xml if they want to. Since we don't include default xml as file, this makes sense. This commit also changes how reload is looked. Now we only look at the configurationFile field of the Config object. This also makes sense because otherwise user cloud accidentally reload from a different file which he started the cluster. Also set configurationFile field where it didn't set previously.
frant-hartm
requested changes
Jan 26, 2022
# Conflicts: # hazelcast/src/main/java/com/hazelcast/instance/impl/DefaultNodeExtension.java
|
The job Click to expand the log file-------------------------- ---------SUMMARY---------- -------------------------- [ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:3.1.2:checkstyle (default) on project hazelcast: An error has occurred in Checkstyle report generation. Failed during checkstyle execution: There are 3 errors reported by Checkstyle 8.38 with /home/jenkins/jenkins_slave/workspace/Hazelcast-pr-builder_2/checkstyle/checkstyle.xml ruleset. -> [Help 1] -------------------------- ---------ERRORS----------- -------------------------- [ERROR] /home/jenkins/jenkins_slave/workspace/Hazelcast-pr-builder_2/hazelcast/src/main/java/com/hazelcast/internal/config/LicenseKey.java:54:101: '8' is a magic number. [MagicNumber] -------------------------- [ERROR] /home/jenkins/jenkins_slave/workspace/Hazelcast-pr-builder_2/hazelcast/src/main/java/com/hazelcast/internal/config/LicenseKey.java:55:30: '+' should be on a new line. [OperatorWrap] -------------------------- [ERROR] /home/jenkins/jenkins_slave/workspace/Hazelcast-pr-builder_2/hazelcast/src/main/java/com/hazelcast/internal/config/LicenseKey.java:56:55: '+' should be on a new line. [OperatorWrap] -------------------------- |
frant-hartm
approved these changes
Jan 28, 2022
vbekiaris
approved these changes
Jan 28, 2022
| @SuppressWarnings("checkstyle:MagicNumber") | ||
| public String toString() { | ||
| // last 8 characters are visible | ||
| String maskedLicense = MASK_FOR_SENSITIVE_DATA + licenseKey.substring(licenseKey.length() - 8); |
There was a problem hiding this comment.
minor: reuse existing license masking code from
?
ramizdundar
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.
License key changes now can be persisted. Also users can set their licenses via configuration update & reloading.
EE PR: https://github.com/hazelcast/hazelcast-enterprise/pull/4579
Checklist:
Team:,Type:,Source:,Module:) and Milestone setAdd to Release NotesorNot Release Notes contentset