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

SOLR-13975: Make sure the stall time is adjusted up when an unusually long 

poll time is configured.
This commit is contained in:
Andrzej Bialecki 2019-12-12 19:04:23 +01:00
parent c40689875a
commit e155649026
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java
View File

@ -152,6 +152,9 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {
this.streamDeletes = builder.streamDeletes; this.streamDeletes = builder.streamDeletes;
this.basePath = builder.baseSolrUrl; this.basePath = builder.baseSolrUrl;
this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 15000); this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 15000);
if (stallTime < pollQueueTime * 2) {
throw new RuntimeException("Invalid stallTime: " + stallTime + "ms, must be 2x > pollQueueTime " + pollQueueTime);
}
if (builder.executorService != null) { if (builder.executorService != null) {
this.scheduler = builder.executorService; this.scheduler = builder.executorService;
@ -214,7 +217,6 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {
try { try {
Update update; Update update;
notifyQueueAndRunnersIfEmptyQueue(); notifyQueueAndRunnersIfEmptyQueue();
//log.info("-- polling 1");
update = queue.poll(pollQueueTime, TimeUnit.MILLISECONDS); update = queue.poll(pollQueueTime, TimeUnit.MILLISECONDS);
if (update == null) { if (update == null) {
@ -662,7 +664,12 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {
*/ */
public void setPollQueueTime(int pollQueueTime) { public void setPollQueueTime(int pollQueueTime) {
this.pollQueueTime = pollQueueTime; this.pollQueueTime = pollQueueTime;
this.stallTime = this.pollQueueTime * 3 / 2; // make sure the stall time is larger than the polling time
// to give a chance for the queue to change
int minimalStallTime = pollQueueTime * 2;
if (minimalStallTime > this.stallTime) {
this.stallTime = minimalStallTime;
}
} }
/** /**

10
solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
View File

@ -134,7 +134,9 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
this.connectionTimeout = builder.connectionTimeoutMillis; this.connectionTimeout = builder.connectionTimeoutMillis;
this.soTimeout = builder.socketTimeoutMillis; this.soTimeout = builder.socketTimeoutMillis;
this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 15000); this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 15000);
if (stallTime < pollQueueTime * 2) {
throw new RuntimeException("Invalid stallTime: " + stallTime + "ms, must be 2x > pollQueueTime " + pollQueueTime);
}
if (builder.executorService != null) { if (builder.executorService != null) {
this.scheduler = builder.executorService; this.scheduler = builder.executorService;
@ -827,6 +829,12 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
*/ */
public void setPollQueueTime(int pollQueueTime) { public void setPollQueueTime(int pollQueueTime) {
this.pollQueueTime = pollQueueTime; this.pollQueueTime = pollQueueTime;
// make sure the stall time is larger than the polling time
// to give a chance for the queue to change
int minimalStallTime = pollQueueTime * 2;
if (minimalStallTime > this.stallTime) {
this.stallTime = minimalStallTime;
}
} }
public void setRequestWriter(RequestWriter requestWriter) { public void setRequestWriter(RequestWriter requestWriter) {