You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/13 17:34:18 UTC
[lucene-solr] branch reference_impl_dev updated: @987 Minor test
hardening, retry test to awaits fix.
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 6f5ffbc @987 Minor test hardening, retry test to awaits fix.
6f5ffbc is described below
commit 6f5ffbc125fee343c4c0f7832e658f0be81d932c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Oct 13 12:33:46 2020 -0500
@987 Minor test hardening, retry test to awaits fix.
---
.../org/apache/solr/client/solrj/embedded/JettyConfig.java | 9 ++-------
.../apache/solr/client/solrj/embedded/JettySolrRunner.java | 4 ----
.../apache/solr/client/solrj/impl/BaseCloudSolrClient.java | 4 ++--
.../solr/client/solrj/impl/CloudSolrClientRetryTest.java | 12 ++++++++++++
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java
index a199203..e343261 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java
@@ -37,8 +37,6 @@ public class JettyConfig {
public final boolean enableV2;
public final boolean stopAtShutdown;
-
- public final Long waitForLoadingCoresToFinishMs;
public final Map<ServletHolder, String> extraServlets;
@@ -52,14 +50,12 @@ public class JettyConfig {
public final SolrQueuedThreadPool qtp;
- private JettyConfig(boolean onlyHttp1, int port, int portRetryTime , String context, boolean stopAtShutdown,
- Long waitForLoadingCoresToFinishMs, Map<ServletHolder, String> extraServlets,
+ private JettyConfig(boolean onlyHttp1, int port, int portRetryTime , String context, boolean stopAtShutdown, Map<ServletHolder, String> extraServlets,
Map<Class<? extends Filter>, String> extraFilters, SSLConfig sslConfig, boolean enableV2, boolean enableProxy, SolrQueuedThreadPool qtp) {
this.onlyHttp1 = onlyHttp1;
this.port = port;
this.context = context;
this.stopAtShutdown = stopAtShutdown;
- this.waitForLoadingCoresToFinishMs = waitForLoadingCoresToFinishMs;
this.extraServlets = extraServlets;
this.extraFilters = extraFilters;
this.sslConfig = sslConfig;
@@ -84,7 +80,6 @@ public class JettyConfig {
builder.enableProxy = other.enableProxy;
builder.portRetryTime = other.portRetryTime;
builder.onlyHttp1 = other.onlyHttp1;
- builder.waitForLoadingCoresToFinishMs = other.waitForLoadingCoresToFinishMs;
builder.enableV2 = other.enableV2;
builder.qtp = other.qtp;
return builder;
@@ -179,7 +174,7 @@ public class JettyConfig {
public JettyConfig build() {
return new JettyConfig(onlyHttp1, port, portRetryTime, context, stopAtShutdown,
- waitForLoadingCoresToFinishMs, extraServlets, extraFilters, sslConfig, enableV2, enableProxy, qtp);
+ extraServlets, extraFilters, sslConfig, enableV2, enableProxy, qtp);
}
}
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 164ac28..36f3a58 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -581,10 +581,6 @@ public class JettySolrRunner implements Closeable {
}
}
- if (config.waitForLoadingCoresToFinishMs != null && config.waitForLoadingCoresToFinishMs > 0L) {
- waitForLoadingCoresToFinish(config.waitForLoadingCoresToFinishMs);
- }
-
if (getCoreContainer() != null && System.getProperty("zkHost") != null) {
SolrZkClient zkClient = getCoreContainer().getZkController().getZkStateReader().getZkClient();
CountDownLatch latch = new CountDownLatch(1);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java
index ffd12a6..acdbe07 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseCloudSolrClient.java
@@ -1392,7 +1392,7 @@ public abstract class BaseCloudSolrClient extends SolrClient {
final boolean hasNoDocuments = (documents == null || documents.isEmpty());
final boolean hasNoDeleteById = (deleteById == null || deleteById.isEmpty());
if (hasNoDocuments && hasNoDeleteById) {
- // no documents and no delete-by-id, so no info to find leader(s)
+ if (log.isDebugEnabled()) log.debug("no documents and no delete-by-id, so no info to find leader(s)");
return false;
}
@@ -1401,7 +1401,7 @@ public abstract class BaseCloudSolrClient extends SolrClient {
final SolrInputDocument doc = entry.getKey();
final Object fieldValue = doc.getFieldValue(idField);
if (fieldValue == null) {
- // a document with no id field value, so can't find leader for it
+ if (log.isDebugEnabled()) log.debug("a document with no id field value, so can't find leader for it");
return false;
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRetryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRetryTest.java
index 1fdde15..37f5c7c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRetryTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientRetryTest.java
@@ -17,6 +17,7 @@
package org.apache.solr.client.solrj.impl;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -30,6 +31,7 @@ import org.apache.solr.util.TestInjection;
import org.junit.BeforeClass;
import org.junit.Test;
+@LuceneTestCase.AwaitsFix(bugUrl = "flakey test on getting metrics")
public class CloudSolrClientRetryTest extends SolrCloudTestCase {
private static final int NODE_COUNT = 1;
@@ -59,6 +61,16 @@ public class CloudSolrClientRetryTest extends SolrCloudTestCase {
NamedList<Object> namedList = response.getResponse();
System.out.println(namedList);
NamedList metrics = (NamedList) namedList.get("metrics");
+
+ // this does not help
+ if (metrics.get(updateRequestCountKey) == null) {
+ Thread.sleep(500);
+ response = solrClient.query(collectionName, params, SolrRequest.METHOD.GET);
+ namedList = response.getResponse();
+ System.out.println(namedList);
+ metrics = (NamedList) namedList.get("metrics");
+ }
+
assertEquals(1L, metrics.get(updateRequestCountKey));
TestInjection.failUpdateRequests = "true:100";