From 6c37541618b080e1d44607dd29d56626b7fd1ccc Mon Sep 17 00:00:00 2001
From: Alan Woodward <romseygeek@apache.org>
Date: Mon, 23 May 2016 15:25:25 +0100
Subject: [PATCH] SOLR-9132: Fix request-counting logic in ConnectionReuseTest

---
 .../apache/solr/client/solrj/ConnectionReuseTest.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java b/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java
index 86540b34923..77d4990d27b 100644
--- a/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java
+++ b/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java
@@ -78,7 +78,12 @@ public class ConnectionReuseTest extends SolrCloudTestCase {
     switch (random().nextInt(3)) {
       case 0:
         // currently only testing with 1 thread
-        return getConcurrentUpdateSolrClient(url.toString() + "/" + COLLECTION, httpClient, 6, 1);
+        return new ConcurrentUpdateSolrClient(url.toString() + "/" + COLLECTION, httpClient, 6, 1) {
+          @Override
+          public void handleError(Throwable ex) {
+            // we're expecting random errors here, don't spam the logs
+          }
+        };
       case 1:
         return getHttpSolrClient(url.toString() + "/" + COLLECTION, httpClient);
       case 2:
@@ -130,6 +135,7 @@ public class ConnectionReuseTest extends SolrCloudTestCase {
           }
           if (!done && i > 0 && i < cnt2 - 1 && client instanceof ConcurrentUpdateSolrClient
               && random().nextInt(10) > 8) {
+            log.info("Pausing - should start a new request");
             queueBreaks++;
             done = true;
             Thread.sleep(350); // wait past streaming client poll time of 250ms
@@ -160,7 +166,7 @@ public class ConnectionReuseTest extends SolrCloudTestCase {
         // we can't fully control queue polling breaking up requests - allow a bit of leeway
         log.info("Outer loop count: {}", cnt1);
         log.info("Queue breaks: {}", queueBreaks);
-        int exp = cnt1 + queueBreaks + 2;
+        int exp = queueBreaks + 3;
         log.info("Expected: {}", exp);
         log.info("Requests: {}", metrics.getRequestCount());
         assertTrue(