Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add timeouts to http calls in SnapPuller 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1441913 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-02-03 14:17:42 +00:00
parent c4f6e3053e
commit fe719d3568
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
solr/core/src/java/org/apache/solr/handler/SnapPuller.java
View File

@ -73,7 +73,6 @@ import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.IndexOutput;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.HttpSolrServer; import org.apache.solr.client.solrj.impl.HttpSolrServer;
@ -86,8 +85,8 @@ import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.FastInputStream; import org.apache.solr.common.util.FastInputStream;
import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CachingDirectoryFactory.CloseListener; import org.apache.solr.core.CachingDirectoryFactory.CloseListener;
import org.apache.solr.core.DirectoryFactory.DirContext;
import org.apache.solr.core.DirectoryFactory; import org.apache.solr.core.DirectoryFactory;
import org.apache.solr.core.DirectoryFactory.DirContext;
import org.apache.solr.core.IndexDeletionPolicyWrapper; import org.apache.solr.core.IndexDeletionPolicyWrapper;
import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.ReplicationHandler.FileInfo; import org.apache.solr.handler.ReplicationHandler.FileInfo;
@ -244,7 +243,9 @@ public class SnapPuller {
params.set(CommonParams.WT, "javabin"); params.set(CommonParams.WT, "javabin");
params.set(CommonParams.QT, "/replication"); params.set(CommonParams.QT, "/replication");
QueryRequest req = new QueryRequest(params); QueryRequest req = new QueryRequest(params);
SolrServer server = new HttpSolrServer(masterUrl, myHttpClient); //XXX modify to use shardhandler HttpSolrServer server = new HttpSolrServer(masterUrl, myHttpClient); //XXX modify to use shardhandler
server.setSoTimeout(60000);
server.setConnectionTimeout(15000);
try { try {
return server.request(req); return server.request(req);
} catch (SolrServerException e) { } catch (SolrServerException e) {
@ -262,7 +263,9 @@ public class SnapPuller {
params.set(CommonParams.WT, "javabin"); params.set(CommonParams.WT, "javabin");
params.set(CommonParams.QT, "/replication"); params.set(CommonParams.QT, "/replication");
QueryRequest req = new QueryRequest(params); QueryRequest req = new QueryRequest(params);
SolrServer server = new HttpSolrServer(masterUrl, myHttpClient); //XXX modify to use shardhandler HttpSolrServer server = new HttpSolrServer(masterUrl, myHttpClient); //XXX modify to use shardhandler
server.setSoTimeout(60000);
server.setConnectionTimeout(15000);
try { try {
NamedList response = server.request(req); NamedList response = server.request(req);
@ -1237,7 +1240,9 @@ public class SnapPuller {
* Open a new stream using HttpClient * Open a new stream using HttpClient
*/ */
FastInputStream getStream() throws IOException { FastInputStream getStream() throws IOException {
SolrServer s = new HttpSolrServer(masterUrl, myHttpClient, null); //XXX use shardhandler HttpSolrServer s = new HttpSolrServer(masterUrl, myHttpClient, null); //XXX use shardhandler
s.setSoTimeout(60000);
s.setConnectionTimeout(15000);
ModifiableSolrParams params = new ModifiableSolrParams(); ModifiableSolrParams params = new ModifiableSolrParams();
// //the method is command=filecontent // //the method is command=filecontent
@ -1496,7 +1501,9 @@ public class SnapPuller {
* Open a new stream using HttpClient * Open a new stream using HttpClient
*/ */
FastInputStream getStream() throws IOException { FastInputStream getStream() throws IOException {
SolrServer s = new HttpSolrServer(masterUrl, myHttpClient, null); //XXX use shardhandler HttpSolrServer s = new HttpSolrServer(masterUrl, myHttpClient, null); //XXX use shardhandler
s.setSoTimeout(60000);
s.setConnectionTimeout(15000);
ModifiableSolrParams params = new ModifiableSolrParams(); ModifiableSolrParams params = new ModifiableSolrParams();
// //the method is command=filecontent // //the method is command=filecontent
@ -1549,7 +1556,9 @@ public class SnapPuller {
params.set(COMMAND, CMD_DETAILS); params.set(COMMAND, CMD_DETAILS);
params.set("slave", false); params.set("slave", false);
params.set(CommonParams.QT, "/replication"); params.set(CommonParams.QT, "/replication");
SolrServer server = new HttpSolrServer(masterUrl, myHttpClient); //XXX use shardhandler HttpSolrServer server = new HttpSolrServer(masterUrl, myHttpClient); //XXX use shardhandler
server.setSoTimeout(60000);
server.setConnectionTimeout(15000);
QueryRequest request = new QueryRequest(params); QueryRequest request = new QueryRequest(params);
return server.request(request); return server.request(request);
} }