remove enterprise license completely from dgraph #9367
Merged
Conversation
This file contains hidden or 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
There was a problem hiding this comment.
Pull Request Overview
A PR to completely remove enterprise license functionality from Dgraph by eliminating all related validations, endpoints, and supporting code.
- Removed enterprise license checks and state fields from admin and membership endpoints.
- Deleted files and code blocks related to enterprise license application, PGP verification, and trial licenses.
- Updated ancillary components (audit, raft, encryption) to no longer conditionally depend on enterprise licensing.
Reviewed Changes
Copilot reviewed 32 out of 32 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| graphql/e2e/common/admin.go | Removed license validations from admin state tests. |
| graphql/admin/state.go | Removed the License field from membership state. |
| graphql/admin/enterpriseLicense.go | Entire file removed to eliminate enterprise license operations. |
| graphql/admin/backup.go | Removed enterprise license check from backup mutation handling. |
| graphql/admin/admin.go | Removed the resolver for enterpriseLicense. |
| ee/audit/audit_ee.go & audit.go | Updated auditor functions to remove dependency on enterprise license. |
| edgraph/access_ee.go | Removed enterprise check from the Login function. |
| dgraphapi/cluster.go | Removed both HTTP and GraphQL endpoints for license application. |
| dgraph/cmd/zero/* | Removed multiple enterprise license features (including PGP tests, trial licenses, and related raft proposals). |
| dgraph/cmd/bulk/run.go | Removed enterprise license check prior to enabling encryption feature. |
| dgraph/cmd/alpha/run.go | Updated audit initialization to the new signature without enterprise check. |
| .trunk/trunk.yaml | Updated lint tool versions. |
Comments suppressed due to low confidence (1)
dgraph/cmd/bulk/run.go:195
- With the removal of the enterprise license check, this log message may mislead users; please update it to reflect that encryption is now available without any enterprise licensing requirements.
log.Printf("Encryption feature enabled.")
8c2e556 to
e2a4143
Compare
e2a4143 to
b81211f
Compare
b81211f to
0d4105d
Compare
ghost
reviewed
Apr 2, 2025
ad30cd7 to
c29d171
Compare
ghost
previously approved these changes
Apr 3, 2025
c29d171 to
1aff8df
Compare
ghost
previously approved these changes
Apr 3, 2025
5e5620d to
b65dfb1
Compare
This PR removes the graphql schema that allows making changes to the license of the dgraph cluster. It also removes the /enterpriseLicense endpoint of Zero.
b65dfb1 to
0878676
Compare
ghost
approved these changes
Apr 4, 2025
Contributor
|
Hello, Best regards |
4 tasks
matthewmcneely
added a commit
that referenced
this pull request
Dec 30, 2025
Zero currently has several issues related to shutdown: - #9367 removed a call to `updateEnterpriseState()` without decreasing the wait group counter. This makes zero wait indefinitely, or exit with a return code other than zero after it has been forced to terminate. - Pools never get shutdown, which keeps the pool's health check alive, resulting in logs with connection failures. - The pool health check uses `time.Sleep`, so even if pools would get shutdown, the shutdown would be delayed by the remaining sleep duration. This PR sets the appropriate wait group counter, implements a function which removes pools on shutdown and switches from `time.Sleep` to `time.Tick` in the health check. --------- Co-authored-by: Matthew McNeely <[email protected]>
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.
This PR removes the graphql schema that allows making changes to the license of the dgraph cluster. It also removes the /enterpriseLicense endpoint of Zero.