Conversation
martinmr
left a comment
There was a problem hiding this comment.
Reviewed 5 of 5 files at r1.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @danielmai and @manishrjain)
manishrjain
left a comment
There was a problem hiding this comment.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @danielmai and @parasssh)
dgraph/cmd/zero/raft.go, line 746 at r1 (raw file):
if !licenseApplied && n.AmLeader() { licenseApplied = true // Apply enterprise license if one was given.
You can mention that this can override the previous license that was present. That's an intended behavior because ...
parasssh
left a comment
There was a problem hiding this comment.
Dismissed @manishrjain from a discussion.
Reviewable status: 4 of 5 files reviewed, all discussions resolved (waiting on @danielmai and @martinmr)
dgraph/cmd/zero/raft.go, line 746 at r1 (raw file):
Previously, manishrjain (Manish R Jain) wrote…
You can mention that this can override the previous license that was present. That's an intended behavior because ...
Done.
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/
( 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/
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/
Fixes DGRAPH-1341
The enterprise_license option on zero is not applied properly. There were couple issues: 1) It would be over-written by trial license. 2) It generally failed because when the license was applied, Raft was not initialized and the zero was not the leader.
This patch make several fixes and improvements
enterprise_licenseonly after the node's Raft is initialized and it is the leader.zw/Tests:
dgraph zeroTrial license is applied.
dgraph zero --enterprise_license=<path to EE license file>EE License is applied.
dgraph zero --enterprise_license=<path to EE license file>EE License is applied.
dgraph zeroOld EE License is used. Trial license is not applied.
enterprise_licenseoptionERROR
enterprise_licenseoption on New, Existing ClusterNo Licenses applied.
This change is