Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-10 03:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

SOLR-14206: Annotate HttpSolrCall as thread-safe (#1205)

Browse Source 
* SOLR-14206: Annotate HttpSolrCall and V2HttpCall as thread-safe
This commit is contained in:
Anshum Gupta 2020-02-03 10:00:43 -08:00 committed by GitHub
parent 34d299018e
commit 02f9b276b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/api/V2HttpCall.java
View File

@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.annotation.SolrThreadSafe;
import org.apache.solr.common.cloud.DocCollection; import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.CommonParams;
@ -62,6 +63,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
// class that handle the '/v2' path // class that handle the '/v2' path
@SolrThreadSafe
public class V2HttpCall extends HttpSolrCall { public class V2HttpCall extends HttpSolrCall {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Api api; private Api api;

10
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
View File

@ -61,6 +61,7 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.annotation.SolrThreadSafe;
import org.apache.solr.common.cloud.Aliases; import org.apache.solr.common.cloud.Aliases;
import org.apache.solr.common.cloud.ClusterState; import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection; import org.apache.solr.common.cloud.DocCollection;
@ -135,6 +136,7 @@ import static org.apache.solr.servlet.SolrDispatchFilter.Action.RETURN;
/** /**
* This class represents a call made to Solr * This class represents a call made to Solr
**/ **/
@SolrThreadSafe
public class HttpSolrCall { public class HttpSolrCall {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@ -415,14 +417,12 @@ public class HttpSolrCall {
if (path.equals(req.getServletPath())) { if (path.equals(req.getServletPath())) {
// avoid endless loop - pass through to Restlet via webapp // avoid endless loop - pass through to Restlet via webapp
action = PASSTHROUGH; action = PASSTHROUGH;
SolrRequestInfo.getRequestInfo().setAction(action);
return;
} else { } else {
// forward rewritten URI (without path prefix and core/collection name) to Restlet // forward rewritten URI (without path prefix and core/collection name) to Restlet
action = FORWARD; action = FORWARD;
SolrRequestInfo.getRequestInfo().setAction(action);
return;
} }
SolrRequestInfo.getRequestInfo().setAction(action);
return;
} }
} }
@ -1126,7 +1126,7 @@ public class HttpSolrCall {
} }
@Override @Override
public Enumeration getHeaderNames() { public Enumeration<String> getHeaderNames() {
return getReq().getHeaderNames(); return getReq().getHeaderNames();
} }