SOLR-18370: remove the ADDROLE/REMOVEROLE Overseer Roles API - #4772
Open
serhiy-bzhezytskyy wants to merge 2 commits into
Open
SOLR-18370: remove the ADDROLE/REMOVEROLE Overseer Roles API#4772serhiy-bzhezytskyy wants to merge 2 commits into
serhiy-bzhezytskyy wants to merge 2 commits into
Conversation
Removes CollectionsHandler's ADDROLE_OP/REMOVEROLE_OP, ClusterAPI's v2 add-role/remove-role commands, ClusterStatus.ROLES_PROP, CollectionAdminRequest. addRole/removeRole, and the roles.json ZK node. Replacement is Node Roles (-Dsolr.node.roles), already in place. The internal re-prioritization signal (a node starting as overseer:preferred nudges the Overseer) reused the ADDROLE enum value and an OverseerRoleCmd class purely because they already existed. Renamed both (REPRIORITIZE_OVERSEER, OverseerPrioritizationCmd) instead of keeping a role-shaped name that needed a paragraph to explain. Orphaned by the removal, also deleted: CollectionsHandler.KNOWN_ROLES, ClusterAPI.RoleInfo, CollectionAdminParams.ROLE (0 remaining refs anywhere, confirmed each with a fresh grep after the previous deletion). Two ADDROLE-only tests replaced with one test of the actual invariant (a preferred node takes over without waiting for the current Overseer to restart); RollingRestartTest deleted wholesale (its single @test was 100% ADDROLE-dependent). Ref-guide updated to match: removed the ADDROLE/REMOVEROLE sections from cluster-node-management.adoc (including a stale roles response field in the CLUSTERSTATUS example), added major-changes-in-solr-11.adoc. AI-assisted (Claude Sonnet 5)
github-actions
Bot
added
documentation
CI's validateLogCalls caught it: switching the ADDROLE-era log.warn to log.info left props.jsonStr() unguarded, an expensive call that would now run even when INFO logging is disabled. Wrapped in isInfoEnabled(), matching the pattern already used elsewhere in this file. AI-assisted (Claude Sonnet 5)
epugh
reviewed
Aug 20, 2026
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.solr.cloud.api.collections; |
Contributor
There was a problem hiding this comment.
Can you give me some context on why we had to add this whole class? This looks like a big add, is it because something was missed when we moved to the node roles earlier?
epugh
reviewed
Aug 20, 2026
| @BeforeClass | ||
| public static void setupCluster() throws Exception { | ||
| configureCluster(4).addConfig("conf", configset("cloud-minimal")).configure(); | ||
| // SolrCloudTestCase randomises solr.cloud.overseer.enabled; this test is about the Overseer |
Contributor
|
@HoustonPutman @dsmiley there is some additional code in this that maybe would be of interest to you to review, it's not just a stright removal. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
https://issues.apache.org/jira/browse/SOLR-18370
Removes the ADDROLE/REMOVEROLE Overseer Roles API. Replacement is Node Roles (
-Dsolr.node.roles), already in place.CollectionsHandlerADDROLE_OP/REMOVEROLE_OP,ClusterAPI's v2 add-role/remove-role,ClusterStatus.ROLES_PROP,CollectionAdminRequest.addRole/removeRole, theroles.jsonZK nodeCollectionsHandler.KNOWN_ROLES,ClusterAPI.RoleInfo,CollectionAdminParams.ROLE-- 0 remaining refs anywhereADDROLEenum value and anOverseerRoleCmdclass only because they already existed. Renamed both (REPRIORITIZE_OVERSEER,OverseerPrioritizationCmd) rather than keep a role-shaped name that needed a paragraph to explainRollingRestartTestdeleted -- its one@Testwas 100% ADDROLE-only.OverseerRolesTest's two ADDROLE tests replaced with one test of the actual invariant: a preferred node takes over without waiting for the current Overseer to restartcluster-node-management.adoc(incl. a stalerolesfield in the CLUSTERSTATUS example), addedmajor-changes-in-solr-11.adoc33 tests, 0 failures. Merge-simulated against all 4 open PRs sharing a file with this one (#4767/#4768/#4769/#4770) together -- applies clean.
AI-assisted (Claude Sonnet 5)