SOLR-17136: Replace most uses of GenericSolrRequest in Solr code #3955
+722
−241
There are no files selected for viewing
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,7 @@ | ||
| title: Introduce new SolrJ SolrRequest classes for metrics and "system info" requests. | ||
| type: added | ||
| authors: | ||
| - name: Isabelle Giguère | ||
| links: | ||
| - name: SOLR-17136 | ||
| url: https://issues.apache.org/jira/browse/SOLR-17136 |
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,126 @@ | ||
| /* | ||
| * 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.client.api.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import java.util.Date; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| /** Response from /node/system */ | ||
| public class NodeSystemResponse extends SolrJerseyResponse { | ||
|
|
||
| @JsonProperty public String mode; | ||
| @JsonProperty public String zkHost; | ||
|
|
||
| @JsonProperty("solr_home") | ||
| public String solrHome; | ||
|
|
||
| @JsonProperty("core_root") | ||
| public String coreRoot; | ||
|
|
||
| @JsonProperty public String environment; | ||
|
|
||
| @JsonProperty(value = "environment_label") | ||
| public String environmentLabel; | ||
|
|
||
| @JsonProperty(value = "environment_color") | ||
| public String environmentColor; | ||
|
|
||
| @JsonProperty public String node; | ||
| @JsonProperty public Lucene lucene; | ||
| @JsonProperty public JVM jvm; | ||
| @JsonProperty public Security security; | ||
| @JsonProperty public GPU gpu; | ||
| @JsonProperty public Map<String, String> system; | ||
|
|
||
| /** /node/system/security */ | ||
| public static class Security { | ||
| @JsonProperty public boolean tls; | ||
| @JsonProperty public String authenticationPlugin; | ||
| @JsonProperty public String authorizationPlugin; | ||
| @JsonProperty public String username; | ||
| @JsonProperty public List<String> roles; | ||
| @JsonProperty public List<String> permissions; | ||
| } | ||
|
|
||
| /** /node/system/lucene */ | ||
| public static class Lucene { | ||
| @JsonProperty("solr-spec-version") | ||
| public String solrSpecVersion; | ||
|
|
||
| @JsonProperty("solr-impl-version") | ||
| public String solrImplVersion; | ||
|
|
||
| @JsonProperty("lucene-spec-version") | ||
| public String luceneSpecVersion; | ||
|
|
||
| @JsonProperty("lucene-impl-version") | ||
| public String luceneImplVersion; | ||
| } | ||
|
|
||
| /** /node/system/jvm */ | ||
| public static class JVM extends Vendor { | ||
| @JsonProperty public int processors; | ||
| @JsonProperty public Vendor jre; | ||
| @JsonProperty public Vendor spec; | ||
| @JsonProperty public Vendor vm; | ||
| @JsonProperty public JvmJmx jmx; | ||
| @JsonProperty public JvmMemory memory; | ||
| } | ||
|
|
||
| public static class JvmMemory { | ||
| @JsonProperty public String free; | ||
| @JsonProperty public String total; | ||
| @JsonProperty public String max; | ||
| @JsonProperty public String used; | ||
| @JsonProperty public JvmMemoryRaw raw; | ||
| } | ||
|
|
||
| public static class JvmMemoryRaw extends MemoryRaw { | ||
| @JsonProperty public long max; | ||
|
|
||
| @JsonProperty("used%") | ||
| public double usedPercent; | ||
| } | ||
|
|
||
| public static class MemoryRaw { | ||
| @JsonProperty public long free; | ||
| @JsonProperty public long total; | ||
| @JsonProperty public long used; | ||
| } | ||
|
|
||
| public static class Vendor { | ||
| @JsonProperty public String name; | ||
| @JsonProperty public String vendor; | ||
| @JsonProperty public String version; | ||
| } | ||
|
|
||
| public static class JvmJmx { | ||
| @JsonProperty public String classpath; | ||
| @JsonProperty public Date startTime; | ||
| @JsonProperty public long upTimeMS; | ||
| @JsonProperty public List<String> commandLineArgs; | ||
| } | ||
|
|
||
| public static class GPU { | ||
| @JsonProperty public boolean available; | ||
| @JsonProperty public long count; | ||
| @JsonProperty public MemoryRaw memory; | ||
| @JsonProperty Map<String, Object> devices; | ||
| } | ||
| } |
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
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.
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.
maybe for future, but is it odd a CLIUtils would call StatusTool for a method
reportStatus? Should it be moved to CLIUtils instead and the StatusTool should call CLIUtils.reportStatus?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.
There are 17 calls to CLIUtils.getZkHost(CommandLine), where we find this call to StatusTool.reportStatus(SolrClient).
That's half the *Tool found in org.apache.solr.cli. That means CLIUtils serves as a "bridge" between tools (StatusTool and the rest of them).
Personally, I think it makes sense that the StatusTool would be the one reporting the status, rather than have it depend on the CLIUtils to essentially do the status reporting job (i.e.: CLIUtils.reportStatus).
Otherwise, if we don't want CLIUtils to call StatusTool, then, we have to add a call to StatusTool.reportStatus(SolrClient) in each of the 17 locations, and for each, find the ZK host currently provided by CLIUtils.getZkHost(CommandLine).
In a nutchell : I would not change this.
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.
makes sense, thanks for digging into this.