SOLR-17582 Stream CLUSTERSTATUS API response #2916
+103
−90
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -16,8 +16,8 @@ | |
| */ | ||
| package org.apache.solr.handler.admin; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
|
|
@@ -27,6 +27,7 @@ | |
| import java.util.Objects; | ||
| import java.util.Set; | ||
| import java.util.stream.Stream; | ||
| import org.apache.solr.common.MapWriter; | ||
| import org.apache.solr.common.SolrException; | ||
| import org.apache.solr.common.cloud.Aliases; | ||
| import org.apache.solr.common.cloud.ClusterState; | ||
|
|
@@ -180,6 +181,14 @@ private void fetchClusterStatusForCollOrAlias( | |
| String routeKey = solrParams.get(ShardParams._ROUTE_); | ||
| String shard = solrParams.get(ZkStateReader.SHARD_ID_PROP); | ||
|
|
||
| Set<String> requestedShards; | ||
| if (shard != null) { | ||
| String[] paramShards = shard.split(","); | ||
| requestedShards = Set.of(paramShards); | ||
| } else { | ||
| requestedShards = Set.of(); | ||
| } | ||
|
|
||
| Stream<DocCollection> collectionStream; | ||
| if (collection == null) { | ||
| collectionStream = clusterState.collectionStream(); | ||
|
|
@@ -205,54 +214,25 @@ private void fetchClusterStatusForCollOrAlias( | |
| } | ||
| } | ||
|
|
||
| MapWriter collectionPropsWriter = | ||
| ew -> { | ||
| collectionStream.forEach( | ||
| (collectionState) -> { | ||
| try { | ||
| ew.put( | ||
| collectionState.getName(), | ||
| buildResponseForCollection( | ||
| collectionState, | ||
| collectionVsAliases, | ||
| routeKey, | ||
| liveNodes, | ||
| requestedShards)); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
|
There was a problem hiding this comment. Why does buildResponseForCollection throw IOException? That's suspicious. If you must, catch in there and throw a suitable exception like SolrException (which extends RuntimeException and is generally preferred within Solr over RE). There was a problem hiding this comment.
|
||
| } | ||
| }); | ||
| }; | ||
| clusterStatus.add("collections", collectionPropsWriter); | ||
| } | ||
|
|
||
| private void addAliasMap(Aliases aliases, NamedList<Object> clusterStatus) { | ||
|
|
@@ -307,23 +287,20 @@ private Map<String, Object> getCollectionStatus( | |
| */ | ||
| @SuppressWarnings("unchecked") | ||
| protected void crossCheckReplicaStateWithLiveNodes( | ||
| List<String> liveNodes, Map<String, Object> collectionProps) { | ||
| Map<String, Object> shards = (Map<String, Object>) collectionProps.get("shards"); | ||
| for (Object nextShard : shards.values()) { | ||
| Map<String, Object> shardMap = (Map<String, Object>) nextShard; | ||
| Map<String, Object> replicas = (Map<String, Object>) shardMap.get("replicas"); | ||
| for (Object nextReplica : replicas.values()) { | ||
| Map<String, Object> replicaMap = (Map<String, Object>) nextReplica; | ||
|
There was a problem hiding this comment. I almost want to cry just glancing at this. There was a problem hiding this comment. I'll change those There was a problem hiding this comment. totally understood. In some old Solr code like this, there's always "and one more thing" we could/should do but ultimately snowballs the scope out of control. I leave it to you to do as you wish. Thank you for your contribution here; I didn't mean to get more out of you than you bargained for :-) |
||
| if (Replica.State.getState((String) replicaMap.get(ZkStateReader.STATE_PROP)) | ||
| != Replica.State.DOWN) { | ||
| // not down, so verify the node is live | ||
| String node_name = (String) replicaMap.get(ZkStateReader.NODE_NAME_PROP); | ||
| if (!liveNodes.contains(node_name)) { | ||
| // node is not live, so this replica is actually down | ||
| replicaMap.put(ZkStateReader.STATE_PROP, Replica.State.DOWN.toString()); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -368,4 +345,47 @@ public static Map<String, Object> postProcessCollectionJSON(Map<String, Object> | |
| collection.put("health", Health.combine(healthStates).toString()); | ||
| return collection; | ||
| } | ||
|
|
||
| private Map<String, Object> buildResponseForCollection( | ||
| DocCollection clusterStateCollection, | ||
| Map<String, List<String>> collectionVsAliases, | ||
| String routeKey, | ||
| List<String> liveNodes, | ||
| Set<String> requestedShards) { | ||
| Map<String, Object> collectionStatus; | ||
| Set<String> shards = new HashSet<>(requestedShards); | ||
| String name = clusterStateCollection.getName(); | ||
|
|
||
| if (routeKey != null) { | ||
| DocRouter router = clusterStateCollection.getRouter(); | ||
| Collection<Slice> slices = router.getSearchSlices(routeKey, null, clusterStateCollection); | ||
| for (Slice slice : slices) { | ||
| shards.add(slice.getName()); | ||
| } | ||
| } | ||
|
|
||
| byte[] bytes = Utils.toJSON(clusterStateCollection); | ||
| @SuppressWarnings("unchecked") | ||
| Map<String, Object> docCollection = (Map<String, Object>) Utils.fromJSON(bytes); | ||
| collectionStatus = getCollectionStatus(docCollection, name, shards); | ||
|
|
||
| collectionStatus.put("znodeVersion", clusterStateCollection.getZNodeVersion()); | ||
| collectionStatus.put( | ||
| "creationTimeMillis", clusterStateCollection.getCreationTime().toEpochMilli()); | ||
|
|
||
| if (collectionVsAliases.containsKey(name) && !collectionVsAliases.get(name).isEmpty()) { | ||
| collectionStatus.put("aliases", collectionVsAliases.get(name)); | ||
| } | ||
| String configName = clusterStateCollection.getConfigName(); | ||
| collectionStatus.put("configName", configName); | ||
| if (solrParams.getBool("prs", false) && clusterStateCollection.isPerReplicaState()) { | ||
| PerReplicaStates prs = clusterStateCollection.getPerReplicaStates(); | ||
| collectionStatus.put("PRS", prs); | ||
| } | ||
|
|
||
| // now we need to walk the collectionProps tree to cross-check replica state with live nodes | ||
| crossCheckReplicaStateWithLiveNodes(liveNodes, collectionStatus); | ||
|
|
||
| return collectionStatus; | ||
| } | ||
| } | ||
This file contains 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 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 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.
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.
friggin beautiful now
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.
putNoExremoves the try/catch we can get it cleaner!