Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-11904: Mark flaky tests as BadApples (#119)

Timothy Potter1cc36f40acd1
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ea1031041ff..bc114c0f4b9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -301,6 +301,9 @@ Bug Fixes
* SOLR-15334: Return error response when failing auth in PKIAuthPlugin (Mike Drob)
+* SOLR-11904: Mark ReplicationHandler's polling thread as a Solr server thread so the PKI Interceptor is activated to
+ allow PULL replicas to replicate from security-enabled leaders (Timothy Potter, Torsten Bøgh Köster)
+
================== 8.9.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
@@ -381,9 +384,6 @@ Bug Fixes
* SOLR-15383: Solr Zookeeper status page shows green even when some Zookeepers are not serving requests (janhoy)
-* SOLR-11904: Mark ReplicationHandler's polling thread as a Solr server thread so the PKI Interceptor is activated to
- allow PULL replicas to replicate from security-enabled leaders (Timothy Potter, Torsten Bøgh Köster)
-
Other Changes
---------------------
* SOLR-15118: Deprecate CollectionAdminRequest.getV2Request(). (Jason Gerlowski)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
index 1bbe258a22f..df23b38284b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
@@ -209,6 +209,7 @@ public class TestPullReplica extends SolrCloudTestCase {
}
@SuppressWarnings("unchecked")
+ @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-15399")
public void testAddDocs() throws Exception {
int numPullReplicas = 1 + random().nextInt(3);
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 1, 0, numPullReplicas)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
index b5cb3700299..d80b9efec0f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
@@ -84,6 +84,7 @@ public class TestPullReplicaWithAuth extends SolrCloudTestCase {
return withBasicAuth(new QueryRequest(q)).process(client);
}
+ @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-15399")
public void testPKIAuthWorksForPullReplication() throws Exception {
int numPullReplicas = 2;
withBasicAuth(CollectionAdminRequest.createCollection(collectionName, "conf", 1, 1, 0, numPullReplicas))