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.

Sign up for GitHub

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

Jump to bottom

Cherry-Pick to v20.03 - EE license fixes. (#5383) #5384

Merged
merged 2 commits into from
May 7, 2020
Merged

Cherry-Pick to v20.03 - EE license fixes. (#5383) #5384

merged 2 commits into from
May 7, 2020

Conversation

parasssh
Copy link
Contributor

@parasssh parasssh commented May 7, 2020 •
edited by dgraph-bot
Loading

( git cherry-pick 4e35cba)
Fixes DGRAPH-1341

This patch make several fixes and improvements

  • Apply the option enterprise_license only after the node's Raft is initialized and it is the leader.
  • Don't apply the trial license if a license already exists.
  • Disallow the enterprise_license option for OSS build and bail out.
  • Apply the option even if there is a license from a previous life of the Zero (i.e. Zero is restarted with same the zw/

This change is Reviewable

Docs Preview: Dgraph Preview

EE license fixes. (#5383)
de08e30 
Fixes DGRAPH-1341

This patch make several fixes and improvements
 -  Apply the option enterprise_license only after the node's Raft is initialized and it is the leader.
  - Don't apply the trial license if a license already exists.
  - Disallow the enterprise_license option for OSS build and bail out.
  - Apply the option even if there is a license from a previous life of the Zero (i.e. Zero is restarted with same the zw/
@parasssh parasssh requested review from manishrjain and a team as code owners May 7, 2020 02:49
martinmr
martinmr approved these changes May 7, 2020
View reviewed changes
Copy link
Contributor

@martinmr martinmr left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 5 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @manishrjain)

@parasssh parasssh merged commit a6df573 into release/v20.03 May 7, 2020
@parasssh parasssh deleted the paras/v2003_ee_lic_fix branch May 7, 2020 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinmr martinmr martinmr approved these changes

@manishrjain manishrjain Awaiting requested review from manishrjain

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@parasssh @martinmr @MichaelJCompton