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/17 23:11:31 UTC
[lucene-solr] 01/49: @515 Tweak remote proxy,
make sure non nightly tests actually cache lazy collection refs.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 48ddfc5afc15e3caf6d58b5175cf444e1e12255f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Aug 11 20:31:55 2020 -0500
@515 Tweak remote proxy, make sure non nightly tests actually cache lazy collection refs.
---
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 8 +++-----
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index ccbb837..81e0617 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -725,7 +725,7 @@ public class HttpSolrCall {
addProxyHeaders(req, proxyRequest);
- InputStreamContentProvider defferedContent = new InputStreamContentProvider(req.getInputStream());
+ InputStreamContentProvider defferedContent = new InputStreamContentProvider(req.getInputStream(), 16384, false);
if (hasContent(req)) {
proxyRequest.content(defferedContent);
@@ -734,9 +734,8 @@ public class HttpSolrCall {
InputStreamResponseListener listener = new InputStreamResponseListener() {
@Override
public void onFailure(Response resp, Throwable t) {
- //System.out.println("proxy to failed");
+ log.error("remote proxy failed", t);
super.onFailure(resp, t);
-
}
@Override
@@ -761,8 +760,7 @@ public class HttpSolrCall {
proxyRequest.send(listener);
- IOUtils.copyLarge(listener.getInputStream(), response.getOutputStream());
-// / response.getOutputStream().flush(); // nocommit try not flushing
+ listener.getInputStream().transferTo(response.getOutputStream());
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index af5db31..eb66c2b 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -231,7 +231,7 @@ public class SolrTestCase extends LuceneTestCase {
System.setProperty("solr.reloadSPI", "false");
// nocommit - not used again yet
- System.setProperty("solr.OverseerStateUpdateDelay", "0");
+ // System.setProperty("solr.OverseerStateUpdateDelay", "0");
System.setProperty("solr.disableMetricsHistoryHandler", "true");