Don't apply enterprise state for oss builds. #3847
Conversation
![pullrequest[bot]](https://avatars.githubusercontent.com/in/3434?s=60&v=4){kind=small}
There was a problem hiding this comment.
✅ A review job has been created and sent to the PullRequest network.
@pawanrawal you can click here to see the review status or cancel the code review job.
There was a problem hiding this comment.
This looks good and I think using build tags to separate it is a good approach
Reviewed with ❤️ by PullRequest
There was a problem hiding this comment.
Reviewed 5 of 5 files at r1.
Reviewable status: all files reviewed, 6 unresolved discussions (waiting on @pawanrawal)
dgraph/cmd/zero/license_ee.go, line 38 at r1 (raw file):
}, } for {
No need to retry. Remove this func.
dgraph/cmd/zero/license_ee.go, line 65 at r1 (raw file):
} enabled := s.state.GetLicense().GetEnabled()
if !enabled { return }
dgraph/cmd/zero/license_ee.go, line 70 at r1 (raw file):
if enabled && !s.state.License.Enabled { // License was enabled earlier and has just now been disabled. glog.Infof("Enterprise license has expired and enterprise features would be disabled now. " +
100 chars.
dgraph/cmd/zero/license_ee.go, line 70 at r1 (raw file):
if enabled && !s.state.License.Enabled { // License was enabled earlier and has just now been disabled. glog.Infof("Enterprise license has expired and enterprise features would be disabled now. " +
Warningf
dgraph/cmd/zero/license_ee.go, line 87 at r1 (raw file):
expiry := time.Unix(s.state.License.ExpiryTs, 0) timeToExpire := expiry.Sub(time.Now()) if enabled && timeToExpire > 0 && timeToExpire < humanize.Week {
Merge this func with the above.
dgraph/cmd/zero/license_ee.go, line 116 at r1 (raw file):
ctx, cancel := context.WithTimeout(context.Background(), time.Minute) defer cancel() if err := st.zero.applyEnterpriseLicense(ctx, bytes.NewReader(b)); err != nil {
st.zero.applyLicense.
There was a problem hiding this comment.
Reviewable status: 1 of 5 files reviewed, 7 unresolved discussions (waiting on @manishrjain)
dgraph/cmd/zero/license_ee.go, line 38 at r1 (raw file):
Previously, manishrjain (Manish R Jain) wrote…
No need to retry. Remove this func.
Can't remove this function it is called from raft.go which is common for oss and !oss builds. For !oss it makes a proposal and for oss it just returns nil. I have removed the retry loop.
dgraph/cmd/zero/license_ee.go, line 65 at r1 (raw file):
Previously, manishrjain (Manish R Jain) wrote…
if !enabled { return }
Done.
dgraph/cmd/zero/license_ee.go, line 70 at r1 (raw file):
Previously, manishrjain (Manish R Jain) wrote…
100 chars.
Done.
dgraph/cmd/zero/license_ee.go, line 70 at r1 (raw file):
Previously, manishrjain (Manish R Jain) wrote…
Warningf
Done.
dgraph/cmd/zero/license_ee.go, line 87 at r1 (raw file):
Previously, manishrjain (Manish R Jain) wrote…
Merge this func with the above.
Done.
dgraph/cmd/zero/license_ee.go, line 116 at r1 (raw file):
Previously, manishrjain (Manish R Jain) wrote…
st.zero.applyLicense.
Done.
dgraph/cmd/zero/raft.go, line 528 at r1 (raw file):
} // periodically checks the validity of the enterprise license and updates the membership state.
This function has been moved to license.go and license_ee.go.
There was a problem hiding this comment.
Reviewed 4 of 4 files at r2.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @manishrjain and @pawanrawal)
dgraph/cmd/zero/license_ee.go, line 82 at r2 (raw file):
} expiry := time.Unix(license.GetExpiryTs(), 0)
Are these in UTC? We should normalize all times to UTC.
Separate out all code which proposes the license and checks for its validity into two different files,
license.goandlicense_ee.go. This ensures that license related operations are only done for!ossbuilds.This change is