-
Notifications
You must be signed in to change notification settings - Fork 857
SOLR-18370: remove the ADDROLE/REMOVEROLE Overseer Roles API #4772
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.
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
Open
serhiy-bzhezytskyy
wants to merge
2
commits into
apache:main
Choose a base branch
from
serhiy-bzhezytskyy:SOLR-18370-remove-overseer-roles-api-fresh
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
8 changes: 8 additions & 0 deletions
8
changelog/unreleased/SOLR-18370-remove-overseer-roles-api.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc | ||
| title: Remove the ADDROLE and REMOVEROLE Collections API commands, their V2 add-role and remove-role counterparts, the CollectionAdminRequest.addRole and removeRole SolrJ methods, and the roles section of CLUSTERSTATUS. Overseer designates are now declared only at startup with node roles, for example -Dsolr.node.roles=data:on,overseer:preferred. | ||
| type: removed | ||
| authors: | ||
| - name: Serhiy Bzhezytskyy | ||
| links: | ||
| - name: SOLR-18370 | ||
| url: https://issues.apache.org/jira/browse/SOLR-18370 |
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
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
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
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
64 changes: 64 additions & 0 deletions
64
solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerPrioritizationCmd.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.solr.cloud.api.collections; | ||
|
|
||
| import java.lang.invoke.MethodHandles; | ||
| import org.apache.solr.cloud.OverseerNodePrioritizer; | ||
| import org.apache.solr.cloud.api.collections.CollApiCmds.CollectionApiCommand; | ||
| import org.apache.solr.common.cloud.ZkNodeProps; | ||
| import org.apache.solr.common.util.NamedList; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** Internal message asking the Overseer to re-run overseer-node prioritization. */ | ||
| public class OverseerPrioritizationCmd implements CollectionApiCommand { | ||
| private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); | ||
|
|
||
| private final CollectionCommandContext ccc; | ||
| private final OverseerNodePrioritizer overseerPrioritizer; | ||
|
|
||
| public OverseerPrioritizationCmd( | ||
| CollectionCommandContext ccc, OverseerNodePrioritizer prioritizer) { | ||
| this.ccc = ccc; | ||
| this.overseerPrioritizer = prioritizer; | ||
| } | ||
|
|
||
| @Override | ||
| public void call(AdminCmdContext context, ZkNodeProps message, NamedList<Object> results) | ||
| throws Exception { | ||
| if (ccc.isDistributedCollectionAPI()) { | ||
| // No Overseer (not accessible from Collection API command execution in any case) so this | ||
| // command can't be run... | ||
| log.error( | ||
| "Cluster is running with distributed Collection API execution. Ignoring internal overseer" | ||
| + " prioritization request."); | ||
| return; | ||
| } | ||
| // if there are too many nodes this may time out, and dedicated overseers are most likely | ||
| // configured when there are many nodes, so do it in a separate thread | ||
| new Thread( | ||
| () -> { | ||
| try { | ||
| overseerPrioritizer.prioritizeOverseerNodes(ccc.getOverseerId()); | ||
| } catch (Exception e) { | ||
| log.error("Error in prioritizing Overseer", e); | ||
| } | ||
| }, | ||
| "OverseerPrioritizationThread") | ||
| .start(); | ||
| } | ||
| } | ||
128 changes: 0 additions & 128 deletions
128
solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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?