You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/08/28 14:40:29 UTC
[lucene-solr] branch reference_impl_dev updated (8351907 -> 68f87ad)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 8351907 @606 Fix race.
new 850e672 @607 Clean up listener synchronization.
new 8099066 @608 Make whats happening with zkSolrClient init a bit more clear.
new 68f87ad @609 Remove returned anon classes.
The 3 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:
.../java/org/apache/solr/cloud/ZkController.java | 14 ++---
.../apache/solr/servlet/SolrDispatchFilter.java | 66 ++++++++++++----------
2 files changed, 40 insertions(+), 40 deletions(-)
[lucene-solr] 01/03: @607 Clean up listener synchronization.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 850e6728874f432f92050032ba5f12454c3e40cd
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Aug 28 09:33:42 2020 -0500
@607 Clean up listener synchronization.
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index be84376..57fbc66 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -2500,8 +2500,7 @@ public class ZkController implements Closeable {
public void addOnReconnectListener(OnReconnect listener) {
if (listener != null) {
reconnectListeners.add(listener);
- log.debug("Added new OnReconnect listener {}", listener);
-
+ if (log.isDebugEnabled()) log.debug("Added new OnReconnect listener {}", listener);
}
}
@@ -2510,12 +2509,10 @@ public class ZkController implements Closeable {
*/
public void removeOnReconnectListener(OnReconnect listener) {
if (listener != null) {
- boolean wasRemoved;
- synchronized (reconnectListeners) {
- wasRemoved = reconnectListeners.remove(listener);
- }
+ boolean wasRemoved = reconnectListeners.remove(listener);
+
if (wasRemoved) {
- log.debug("Removed OnReconnect listener {}", listener);
+ if (log.isDebugEnabled()) log.debug("Removed OnReconnect listener {}", listener);
} else {
log.warn("Was asked to remove OnReconnect listener {}, but remove operation " +
"did not find it in the list of registered listeners."
@@ -2525,8 +2522,7 @@ public class ZkController implements Closeable {
}
Set<OnReconnect> getCurrentOnReconnectListeners() {
- Set<OnReconnect> clonedListeners = new HashSet<>(reconnectListeners);
- return clonedListeners;
+ return Collections.unmodifiableSet(reconnectListeners);
}
/**
[lucene-solr] 02/03: @608 Make whats happening with zkSolrClient
init a bit more clear.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 80990663e8609503d0d048526aa29792da5529f4
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Aug 28 09:34:08 2020 -0500
@608 Make whats happening with zkSolrClient init a bit more clear.
---
solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index bb99213..cbdb8b8 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -294,11 +294,11 @@ public class SolrDispatchFilter extends BaseSolrFilter {
protected synchronized CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) {
String zkHost = System.getProperty("zkHost");
if (!StringUtils.isEmpty(zkHost)) {
- int startUpZkTimeOut = Integer.getInteger("waitForZk", 30); // nocommit - zk settings
+ int zkClientTimeout = Integer.getInteger("zkConnectTimeout", 30000); // nocommit - must come from zk settings, we should parse more here and set this up vs waiting for zkController
if (zkClient != null) {
throw new IllegalStateException();
}
- zkClient = new SolrZkClient(zkHost, (int) TimeUnit.SECONDS.toMillis(startUpZkTimeOut));
+ zkClient = new SolrZkClient(zkHost, zkClientTimeout);
zkClient.enableCloseLock();
zkClient.start();
}
[lucene-solr] 03/03: @609 Remove returned anon classes.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 68f87ad7e5db5883482fd8c60058a00177a1b1c1
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Aug 28 09:39:46 2020 -0500
@609 Remove returned anon classes.
---
.../apache/solr/servlet/SolrDispatchFilter.java | 62 ++++++++++++----------
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index cbdb8b8..f254233 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -653,21 +653,9 @@ public class SolrDispatchFilter extends BaseSolrFilter {
public static HttpServletRequest closeShield(HttpServletRequest request, boolean retry) {
if (!retry) {
return new HttpServletRequestWrapper(request) {
-
@Override
public ServletInputStream getInputStream() throws IOException {
-
- return new ServletInputStreamWrapper(super.getInputStream()) {
- @Override
- public void close() {
- // even though we skip closes, we let local tests know not to close so that a full understanding can take
- // place
- assert Thread.currentThread().getStackTrace()[2].getClassName().matches(
- "org\\.apache\\.(?:solr|lucene).*") ? false : true : CLOSE_STREAM_MSG;
- this.stream = ClosedServletInputStream.CLOSED_SERVLET_INPUT_STREAM;
- }
- };
-
+ return new CloseShieldServletInputStreamWrapper(request.getInputStream());
}
};
} else {
@@ -688,23 +676,9 @@ public class SolrDispatchFilter extends BaseSolrFilter {
public static HttpServletResponse closeShield(HttpServletResponse response, boolean retry) {
if (!retry) {
return new HttpServletResponseWrapper(response) {
-
@Override
public ServletOutputStream getOutputStream() throws IOException {
-
- return new ServletOutputStreamWrapper(super.getOutputStream()) {
- @Override
- public void close() {
- // even though we skip closes, we let local tests know not to close so that a full understanding can take
- // place
- assert Thread.currentThread().getStackTrace()[2].getClassName().matches(
- "org\\.apache\\.(?:solr|lucene).*") ? false
- : true : CLOSE_STREAM_MSG;
- stream = ClosedServletOutputStream.CLOSED_SERVLET_OUTPUT_STREAM;
- }
- };
-
-
+ return new CloseShieldServletOutputStreamWrapper(response.getOutputStream());
}
@Override
@@ -713,7 +687,6 @@ public class SolrDispatchFilter extends BaseSolrFilter {
response.getWriter().write(msg);
}
-
@Override
public void sendError(int sc) throws IOException {
sendError(sc, "Solr ran into an unexpected problem and doesn't seem to know more about it. There may be more information in the Solr logs.");
@@ -723,4 +696,35 @@ public class SolrDispatchFilter extends BaseSolrFilter {
return response;
}
}
+
+ private static class CloseShieldServletInputStreamWrapper extends ServletInputStreamWrapper {
+ public CloseShieldServletInputStreamWrapper(ServletInputStream stream) throws IOException {
+ super(stream);
+ }
+
+ @Override
+ public void close() {
+ // even though we skip closes, we let local tests know not to close so that a full understanding can take
+ // place
+ assert Thread.currentThread().getStackTrace()[2].getClassName().matches(
+ "org\\.apache\\.(?:solr|lucene).*") ? false : true : CLOSE_STREAM_MSG;
+ this.stream = ClosedServletInputStream.CLOSED_SERVLET_INPUT_STREAM;
+ }
+ }
+
+ private static class CloseShieldServletOutputStreamWrapper extends ServletOutputStreamWrapper {
+ public CloseShieldServletOutputStreamWrapper(ServletOutputStream stream) {
+ super(stream);
+ }
+
+ @Override
+ public void close() {
+ // even though we skip closes, we let local tests know not to close so that a full understanding can take
+ // place
+ assert Thread.currentThread().getStackTrace()[2].getClassName().matches(
+ "org\\.apache\\.(?:solr|lucene).*") ? false
+ : true : CLOSE_STREAM_MSG;
+ stream = ClosedServletOutputStream.CLOSED_SERVLET_OUTPUT_STREAM;
+ }
+ }
}