You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2023/08/23 16:46:21 UTC
[solr] branch branch_9x updated (56d322464a8 -> 9fffccd6eac)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from 56d322464a8 SOLR-16946: Updated Cluster Singleton plugins are stopped correctly when the Overseer is closed (#1862)
new 727ae792367 Cleaning up old code to prevent warnings (#1834)
new 9fffccd6eac fix backporting code merge
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/java/org/apache/solr/cli/AssertTool.java | 3 ---
.../java/org/apache/solr/cli/SimplePostTool.java | 31 +++++++++++-----------
.../core/src/java/org/apache/solr/cli/SolrCLI.java | 11 +++-----
.../src/java/org/apache/solr/cli/StatusTool.java | 5 +---
4 files changed, 19 insertions(+), 31 deletions(-)
[solr] 02/02: fix backporting code merge
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 9fffccd6eac90465febc68d4f87d78a68b151fe7
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Wed Aug 23 12:46:07 2023 -0400
fix backporting code merge
---
solr/core/src/java/org/apache/solr/cli/AssertTool.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
index 0ffb4606b20..7fbe4ff5bc7 100644
--- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
@@ -34,6 +34,7 @@ import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.HealthCheckRequest;
+import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.common.util.NamedList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[solr] 01/02: Cleaning up old code to prevent warnings (#1834)
Posted by ep...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 727ae792367f80b6e1714699b0f7d4d63dc3fdb8
Author: Renato Haeberli <re...@onnet.ch>
AuthorDate: Wed Aug 23 13:48:27 2023 +0200
Cleaning up old code to prevent warnings (#1834)
---------
Co-authored-by: Renato Haeberli <>
Co-authored-by: Eric Pugh <ep...@opensourceconnections.com>
---
.../src/java/org/apache/solr/cli/AssertTool.java | 4 ---
.../java/org/apache/solr/cli/SimplePostTool.java | 31 +++++++++++-----------
.../core/src/java/org/apache/solr/cli/SolrCLI.java | 11 +++-----
.../src/java/org/apache/solr/cli/StatusTool.java | 5 +---
4 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
index b88dad4d805..0ffb4606b20 100644
--- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
@@ -34,8 +34,6 @@ import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.HealthCheckRequest;
-import org.apache.solr.client.solrj.response.CollectionAdminResponse;
-import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -242,8 +240,6 @@ public class AssertTool extends ToolBase {
NamedList<Object> response = solrClient.request(new HealthCheckRequest());
Integer statusCode = (Integer) response.findRecursive("responseHeader", "status");
SolrCLI.checkCodeForAuthError(statusCode);
- } catch (SolrException se) {
- throw se;
} catch (IOException | SolrServerException e) {
log.debug("Opening connection to {} failed, Solr does not seem to be running", url, e);
return 0;
diff --git a/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java b/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
index d15650e1636..6def73ad789 100644
--- a/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/SimplePostTool.java
@@ -519,14 +519,7 @@ public class SimplePostTool {
int filesPosted = 0;
for (int j = startIndexInArgs; j < args.length; j++) {
File srcFile = new File(args[j]);
- boolean isValidPath = checkIsValidPath(srcFile);
- if (isValidPath && srcFile.isDirectory() && srcFile.canRead()) {
- filesPosted += postDirectory(srcFile, out, type);
- } else if (isValidPath && srcFile.isFile() && srcFile.canRead()) {
- filesPosted += postFiles(new File[] {srcFile}, out, type);
- } else {
- filesPosted += handleGlob(srcFile, out, type);
- }
+ filesPosted = getFilesPosted(out, type, srcFile);
}
return filesPosted;
}
@@ -544,14 +537,20 @@ public class SimplePostTool {
reset();
int filesPosted = 0;
for (File srcFile : files) {
- boolean isValidPath = checkIsValidPath(srcFile);
- if (isValidPath && srcFile.isDirectory() && srcFile.canRead()) {
- filesPosted += postDirectory(srcFile, out, type);
- } else if (isValidPath && srcFile.isFile() && srcFile.canRead()) {
- filesPosted += postFiles(new File[] {srcFile}, out, type);
- } else {
- filesPosted += handleGlob(srcFile, out, type);
- }
+ filesPosted = getFilesPosted(out, type, srcFile);
+ }
+ return filesPosted;
+ }
+
+ private int getFilesPosted(final OutputStream out, final String type, final File srcFile) {
+ int filesPosted = 0;
+ boolean isValidPath = checkIsValidPath(srcFile);
+ if (isValidPath && srcFile.isDirectory() && srcFile.canRead()) {
+ filesPosted += postDirectory(srcFile, out, type);
+ } else if (isValidPath && srcFile.isFile() && srcFile.canRead()) {
+ filesPosted += postFiles(new File[] {srcFile}, out, type);
+ } else {
+ filesPosted += handleGlob(srcFile, out, type);
}
return filesPosted;
}
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 31960a262ac..f79b298bf1a 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -23,7 +23,6 @@ import static org.apache.solr.common.params.CommonParams.NAME;
import com.google.common.annotations.VisibleForTesting;
import java.io.File;
import java.lang.invoke.MethodHandles;
-import java.net.ConnectException;
import java.net.SocketException;
import java.net.URL;
import java.util.ArrayList;
@@ -421,11 +420,7 @@ public class SolrCLI implements CLIO {
*/
public static boolean checkCommunicationError(Exception exc) {
Throwable rootCause = SolrException.getRootCause(exc);
- boolean wasCommError =
- (rootCause instanceof ConnectException
- || rootCause instanceof SolrServerException
- || rootCause instanceof SocketException);
- return wasCommError;
+ return (rootCause instanceof SolrServerException || rootCause instanceof SocketException);
}
public static void checkCodeForAuthError(int code) {
@@ -630,8 +625,8 @@ public class SolrCLI implements CLIO {
}
NamedList<Object> existsCheckResult =
CoreAdminRequest.getStatus(coreName, solrClient).getResponse();
- NamedList<Object> status = (NamedList) existsCheckResult.get("status");
- NamedList<Object> coreStatus = (NamedList) status.get(coreName);
+ NamedList<Object> status = (NamedList<Object>) existsCheckResult.get("status");
+ NamedList<Object> coreStatus = (NamedList<Object>) status.get(coreName);
Map<String, Object> failureStatus =
(Map<String, Object>) existsCheckResult.get("initFailures");
String errorMsg = (String) failureStatus.get(coreName);
diff --git a/solr/core/src/java/org/apache/solr/cli/StatusTool.java b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
index 44eac2cbdce..d553e7ad8ad 100644
--- a/solr/core/src/java/org/apache/solr/cli/StatusTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import javax.net.ssl.SSLPeerUnverifiedException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.solr.client.solrj.SolrClient;
@@ -113,8 +112,6 @@ public class StatusTool extends ToolBase {
while (System.nanoTime() < timeout) {
try {
return getStatus(solrUrl);
- } catch (SSLPeerUnverifiedException exc) {
- throw exc;
} catch (Exception exc) {
if (SolrCLI.exceptionIsAuthRelated(exc)) {
throw exc;
@@ -189,7 +186,7 @@ public class StatusTool extends ToolBase {
cloudStatus.put("liveNodes", String.valueOf(liveNodes.size()));
Map<String, Object> collections =
- ((NamedList) json.findRecursive("cluster", "collections")).asMap();
+ ((NamedList<Object>) json.findRecursive("cluster", "collections")).asMap();
cloudStatus.put("collections", String.valueOf(collections.size()));
return cloudStatus;