[lucene-solr] branch reference_impl_dev updated: @745 Harden test.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new e087856  @745 Harden test.
e087856 is described below

commit e087856656bfd3ec4efe764dfca41c3f95eb8f50
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Sep 5 11:06:53 2020 -0500

    @745 Harden test.
---
 .../solr/client/solrj/impl/CloudSolrClientTest.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index c89bc5e..b49b9c7 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -31,6 +31,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import com.google.common.collect.Lists;
@@ -68,6 +69,8 @@ import org.apache.solr.common.params.ShardParams;
 import org.apache.solr.common.params.UpdateParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.SimpleOrderedMap;
+import org.apache.solr.common.util.TimeOut;
+import org.apache.solr.common.util.TimeSource;
 import org.apache.solr.handler.admin.CollectionsHandler;
 import org.apache.solr.handler.admin.ConfigSetsHandler;
 import org.apache.solr.handler.admin.CoreAdminHandler;
@@ -626,6 +629,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
         } catch (Exception e) {
           // expected
         }
+
         long errorsAfter = 0;
         for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
           Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "ADMIN", adminPathToMbean.get(adminPath), adminPath, true);
@@ -634,6 +638,19 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
             log.info("Found {} requests to {} on {}", numRequests, adminPath, runner.getBaseUrl());
           }
         }
+
+        if (errorsBefore + 1 != errorsAfter) {
+          Thread.sleep(100);
+          errorsAfter = 0;
+          for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
+            Long numRequests = getNumRequests(runner.getBaseUrl().toString(), "foo", "ADMIN", adminPathToMbean.get(adminPath), adminPath, true);
+            errorsAfter += numRequests;
+            if (log.isInfoEnabled()) {
+              log.info("Found {} requests to {} on {}", numRequests, adminPath, runner.getBaseUrl());
+            }
+          }
+        }
+
         assertEquals(errorsBefore + 1, errorsAfter);
       }
     }