You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by GitBox <gi...@apache.org> on 2021/04/30 23:25:50 UTC
[GitHub] [solr] thelabdude opened a new pull request #110: Mark ReplicationHandler's polling thread as a Solr thread so PKI Interceptor does its thing allowing PULL replicas to replicate from security-enabled leaders
thelabdude opened a new pull request #110:
URL: https://github.com/apache/solr/pull/110
# Description
Fixes SOLR-11904
# Solution
The PKI interceptor relies on a check that the requesting thread is a Solr server thread (to avoid client requests from trying to exploit this auth framework). The ReplicationHandler's polling thread is not created using the ExecutorUtil (since it's a scheduled), so needs to explicitly mark itself as a server thread so the PKI interceptor kicks in for calling out to leaders.
# Tests
TODO: tested this manually ... still need to build a unit test to cover this escape
# Checklist
Please review the following and check all that apply:
- [ ] I have reviewed the guidelines for [How to Contribute](https://wiki.apache.org/solr/HowToContribute) and my code conforms to the standards described there to the best of my ability.
- [ ] I have created a Jira issue and added the issue ID to my pull request title.
- [ ] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended)
- [ ] I have developed this patch against the `main` branch.
- [ ] I have run `./gradlew check`.
- [ ] I have added tests for my changes.
- [ ] I have added documentation for the [Reference Guide](https://github.com/apache/solr/tree/main/solr/solr-ref-guide)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] thelabdude commented on pull request #110: 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
Posted by GitBox <gi...@apache.org>.
thelabdude commented on pull request #110:
URL: https://github.com/apache/solr/pull/110#issuecomment-831598243
Going to watch the new unit test in nightlies before back-porting to 8.x
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] madrob commented on a change in pull request #110: 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
Posted by GitBox <gi...@apache.org>.
madrob commented on a change in pull request #110:
URL: https://github.com/apache/solr/pull/110#discussion_r625426497
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
##########
@@ -97,6 +92,90 @@ public static void tearDownCluster() {
TestInjection.reset();
}
+ static void waitForDeletion(String collection) throws InterruptedException, KeeperException {
Review comment:
nit: did this need to move, or can it stay around line 555 to minimize the diff? All of these methods moved around but it looks like they mostly stayed the same. Feel free to move them in a follow on PR :)
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
##########
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.CollectionAdminResponse;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.cloud.DocCollection;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.util.Utils;
+import org.apache.solr.security.BasicAuthPlugin;
+import org.apache.solr.security.RuleBasedAuthorizationPlugin;
+import org.apache.solr.util.LogLevel;
+import org.apache.solr.util.TestInjection;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static org.apache.solr.cloud.TestPullReplica.assertNumberOfReplicas;
+import static org.apache.solr.cloud.TestPullReplica.assertUlogPresence;
+import static org.apache.solr.cloud.TestPullReplica.waitForDeletion;
+import static org.apache.solr.cloud.TestPullReplica.waitForNumDocsInAllReplicas;
+import static org.apache.solr.security.Sha256AuthenticationProvider.getSaltedHashedValue;
+
+@Slow
+@LogLevel("org.apache.solr.handler.ReplicationHandler=DEBUG,org.apache.solr.handler.IndexFetcher=DEBUG")
+public class TestPullReplicaWithAuth extends SolrCloudTestCase {
+
+ private static final String USER = "solr";
+ private static final String PASS = "SolrRocksAgain";
+ private static final String collectionName = "testPullReplicaWithAuth";
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ final String SECURITY_JSON = Utils.toJSONString
Review comment:
Can you try this with Map.of, which is more type safe? I've got similar stuff going on in #107
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
##########
@@ -122,15 +201,15 @@ public void tearDown() throws Exception {
super.tearDown();
}
- @Repeat(iterations=2) // 2 times to make sure cleanup is complete and we can create the same collection
- // commented out on: 17-Feb-2019 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018
+ @Repeat(iterations = 2) // 2 times to make sure cleanup is complete and we can create the same collection
public void testCreateDelete() throws Exception {
+ final int rand = 0; // random().nextInt(3);
Review comment:
Dubious
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
##########
@@ -191,91 +270,56 @@ public void testCreateDelete() throws Exception {
}
}
- /**
- * Asserts that Update logs don't exist for replicas of type {@link org.apache.solr.common.cloud.Replica.Type#PULL}
- */
- private void assertUlogPresence(DocCollection collection) {
- for (Slice s:collection.getSlices()) {
- for (Replica r:s.getReplicas()) {
- if (r.getType() == Replica.Type.NRT) {
- continue;
- }
- SolrCore core = null;
- try {
- core = cluster.getReplicaJetty(r).getCoreContainer().getCore(r.getCoreName());
- assertNotNull(core);
- assertFalse("Update log should not exist for replicas of type Passive but file is present: " + core.getUlogDir(),
- new java.io.File(core.getUlogDir()).exists());
- } finally {
- core.close();
- }
- }
- }
- }
-
@SuppressWarnings("unchecked")
- // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
public void testAddDocs() throws Exception {
- int numPullReplicas = 1 + random().nextInt(3);
+ int numPullReplicas = 1; // + random().nextInt(3);
Review comment:
Does this fail with more than 1?
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
##########
@@ -191,91 +270,56 @@ public void testCreateDelete() throws Exception {
}
}
- /**
- * Asserts that Update logs don't exist for replicas of type {@link org.apache.solr.common.cloud.Replica.Type#PULL}
- */
- private void assertUlogPresence(DocCollection collection) {
- for (Slice s:collection.getSlices()) {
- for (Replica r:s.getReplicas()) {
- if (r.getType() == Replica.Type.NRT) {
- continue;
- }
- SolrCore core = null;
- try {
- core = cluster.getReplicaJetty(r).getCoreContainer().getCore(r.getCoreName());
- assertNotNull(core);
- assertFalse("Update log should not exist for replicas of type Passive but file is present: " + core.getUlogDir(),
- new java.io.File(core.getUlogDir()).exists());
- } finally {
- core.close();
- }
- }
- }
- }
-
@SuppressWarnings("unchecked")
- // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
public void testAddDocs() throws Exception {
- int numPullReplicas = 1 + random().nextInt(3);
+ int numPullReplicas = 1; // + random().nextInt(3);
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 1, 0, numPullReplicas)
- .process(cluster.getSolrClient());
- waitForState("Expected collection to be created with 1 shard and " + (numPullReplicas + 1) + " replicas", collectionName, clusterShape(1, numPullReplicas + 1));
+ .process(cluster.getSolrClient());
+ waitForState("Expected collection to be created with 1 shard and " + (numPullReplicas + 1) + " replicas",
+ collectionName, clusterShape(1, numPullReplicas + 1));
DocCollection docCollection = assertNumberOfReplicas(1, 0, numPullReplicas, false, true);
assertEquals(1, docCollection.getSlices().size());
- boolean reloaded = false;
int numDocs = 0;
- while (true) {
+ CloudSolrClient solrClient = cluster.getSolrClient();
+ for (int i = 0; i < 5; i++) {
numDocs++;
- cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", String.valueOf(numDocs), "foo", "bar"));
- cluster.getSolrClient().commit(collectionName);
+
+ UpdateRequest ureq = new UpdateRequest();
+ ureq.add(new SolrInputDocument("id", String.valueOf(numDocs), "foo", "bar"));
+ ureq.process(solrClient, collectionName);
+ ureq.commit(solrClient, collectionName);
Review comment:
just curious why this needed to be split out into two calls? if it's just for debugging, or there's some condition under test. leave a comment either way.
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
##########
@@ -191,91 +270,56 @@ public void testCreateDelete() throws Exception {
}
}
- /**
- * Asserts that Update logs don't exist for replicas of type {@link org.apache.solr.common.cloud.Replica.Type#PULL}
- */
- private void assertUlogPresence(DocCollection collection) {
- for (Slice s:collection.getSlices()) {
- for (Replica r:s.getReplicas()) {
- if (r.getType() == Replica.Type.NRT) {
- continue;
- }
- SolrCore core = null;
- try {
- core = cluster.getReplicaJetty(r).getCoreContainer().getCore(r.getCoreName());
- assertNotNull(core);
- assertFalse("Update log should not exist for replicas of type Passive but file is present: " + core.getUlogDir(),
- new java.io.File(core.getUlogDir()).exists());
- } finally {
- core.close();
- }
- }
- }
- }
-
@SuppressWarnings("unchecked")
- // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
public void testAddDocs() throws Exception {
- int numPullReplicas = 1 + random().nextInt(3);
+ int numPullReplicas = 1; // + random().nextInt(3);
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 1, 0, numPullReplicas)
- .process(cluster.getSolrClient());
- waitForState("Expected collection to be created with 1 shard and " + (numPullReplicas + 1) + " replicas", collectionName, clusterShape(1, numPullReplicas + 1));
+ .process(cluster.getSolrClient());
+ waitForState("Expected collection to be created with 1 shard and " + (numPullReplicas + 1) + " replicas",
+ collectionName, clusterShape(1, numPullReplicas + 1));
DocCollection docCollection = assertNumberOfReplicas(1, 0, numPullReplicas, false, true);
assertEquals(1, docCollection.getSlices().size());
- boolean reloaded = false;
int numDocs = 0;
- while (true) {
+ CloudSolrClient solrClient = cluster.getSolrClient();
+ for (int i = 0; i < 5; i++) {
numDocs++;
- cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", String.valueOf(numDocs), "foo", "bar"));
- cluster.getSolrClient().commit(collectionName);
+
+ UpdateRequest ureq = new UpdateRequest();
+ ureq.add(new SolrInputDocument("id", String.valueOf(numDocs), "foo", "bar"));
+ ureq.process(solrClient, collectionName);
+ ureq.commit(solrClient, collectionName);
Slice s = docCollection.getSlices().iterator().next();
try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {
assertEquals(numDocs, leaderClient.query(new SolrQuery("*:*")).getResults().getNumFound());
}
- TimeOut t = new TimeOut(REPLICATION_TIMEOUT_SECS, TimeUnit.SECONDS, TimeSource.NANO_TIME);
- for (Replica r:s.getReplicas(EnumSet.of(Replica.Type.PULL))) {
- //TODO: assert replication < REPLICATION_TIMEOUT_SECS
+ List<Replica> pullReplicas = s.getReplicas(EnumSet.of(Replica.Type.PULL));
+ waitForNumDocsInAllReplicas(numDocs, pullReplicas);
+
+ for (Replica r : pullReplicas) {
try (HttpSolrClient pullReplicaClient = getHttpSolrClient(r.getCoreUrl())) {
- while (true) {
- try {
- assertEquals("Replica " + r.getName() + " not up to date after 10 seconds",
- numDocs, pullReplicaClient.query(new SolrQuery("*:*")).getResults().getNumFound());
- break;
- } catch (AssertionError e) {
- if (t.hasTimedOut()) {
- throw e;
- } else {
- Thread.sleep(100);
- }
- }
- }
- SolrQuery req = new SolrQuery(
- "qt", "/admin/plugins",
- "stats", "true");
+ SolrQuery req = new SolrQuery("qt", "/admin/plugins", "stats", "true");
QueryResponse statsResponse = pullReplicaClient.query(req);
+ // adds is a gauge, which is null for PULL replicas
+ assertNull("Replicas shouldn't process the add document request: " + statsResponse,
+ ((Map<String, Object>) (statsResponse.getResponse()).findRecursive("plugins", "UPDATE", "updateHandler", "stats")).get("UPDATE.updateHandler.adds"));
assertEquals("Replicas shouldn't process the add document request: " + statsResponse,
- 0L, ((Map<String, Object>)(statsResponse.getResponse()).findRecursive("plugins", "UPDATE", "updateHandler", "stats")).get("UPDATE.updateHandler.adds"));
+ 0L, ((Map<String, Object>) (statsResponse.getResponse()).findRecursive("plugins", "UPDATE", "updateHandler", "stats")).get("UPDATE.updateHandler.cumulativeAdds.count"));
Review comment:
Can we pull out the common parts of these lines?
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
##########
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.CollectionAdminResponse;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.cloud.DocCollection;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.util.Utils;
+import org.apache.solr.security.BasicAuthPlugin;
+import org.apache.solr.security.RuleBasedAuthorizationPlugin;
+import org.apache.solr.util.LogLevel;
+import org.apache.solr.util.TestInjection;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static org.apache.solr.cloud.TestPullReplica.assertNumberOfReplicas;
+import static org.apache.solr.cloud.TestPullReplica.assertUlogPresence;
+import static org.apache.solr.cloud.TestPullReplica.waitForDeletion;
+import static org.apache.solr.cloud.TestPullReplica.waitForNumDocsInAllReplicas;
+import static org.apache.solr.security.Sha256AuthenticationProvider.getSaltedHashedValue;
+
+@Slow
+@LogLevel("org.apache.solr.handler.ReplicationHandler=DEBUG,org.apache.solr.handler.IndexFetcher=DEBUG")
+public class TestPullReplicaWithAuth extends SolrCloudTestCase {
+
+ private static final String USER = "solr";
+ private static final String PASS = "SolrRocksAgain";
+ private static final String collectionName = "testPullReplicaWithAuth";
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ final String SECURITY_JSON = Utils.toJSONString
+ (Utils.makeMap("authorization",
+ Utils.makeMap("class", RuleBasedAuthorizationPlugin.class.getName(),
+ "user-role", singletonMap(USER, "admin"),
+ "permissions", singletonList(Utils.makeMap("name", "all", "role", "admin"))),
+ "authentication",
+ Utils.makeMap("class", BasicAuthPlugin.class.getName(),
+ "blockUnknown", true,
+ "credentials", singletonMap(USER, getSaltedHashedValue(PASS)))));
+
+ configureCluster(3)
+ .addConfig("conf", configset("cloud-minimal"))
+ .withSecurityJson(SECURITY_JSON)
+ .configure();
+ }
+
+ @AfterClass
+ public static void tearDownCluster() {
+ TestInjection.reset();
Review comment:
don't think we need this, I think it's automatically done for us
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java
##########
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.cloud;
+
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.CollectionAdminResponse;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.cloud.DocCollection;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.util.Utils;
+import org.apache.solr.security.BasicAuthPlugin;
+import org.apache.solr.security.RuleBasedAuthorizationPlugin;
+import org.apache.solr.util.LogLevel;
+import org.apache.solr.util.TestInjection;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static org.apache.solr.cloud.TestPullReplica.assertNumberOfReplicas;
+import static org.apache.solr.cloud.TestPullReplica.assertUlogPresence;
+import static org.apache.solr.cloud.TestPullReplica.waitForDeletion;
+import static org.apache.solr.cloud.TestPullReplica.waitForNumDocsInAllReplicas;
+import static org.apache.solr.security.Sha256AuthenticationProvider.getSaltedHashedValue;
+
+@Slow
+@LogLevel("org.apache.solr.handler.ReplicationHandler=DEBUG,org.apache.solr.handler.IndexFetcher=DEBUG")
+public class TestPullReplicaWithAuth extends SolrCloudTestCase {
+
+ private static final String USER = "solr";
+ private static final String PASS = "SolrRocksAgain";
+ private static final String collectionName = "testPullReplicaWithAuth";
+
+ @BeforeClass
+ public static void setupCluster() throws Exception {
+ final String SECURITY_JSON = Utils.toJSONString
+ (Utils.makeMap("authorization",
+ Utils.makeMap("class", RuleBasedAuthorizationPlugin.class.getName(),
+ "user-role", singletonMap(USER, "admin"),
+ "permissions", singletonList(Utils.makeMap("name", "all", "role", "admin"))),
+ "authentication",
+ Utils.makeMap("class", BasicAuthPlugin.class.getName(),
+ "blockUnknown", true,
+ "credentials", singletonMap(USER, getSaltedHashedValue(PASS)))));
+
+ configureCluster(3)
+ .addConfig("conf", configset("cloud-minimal"))
+ .withSecurityJson(SECURITY_JSON)
+ .configure();
+ }
+
+ @AfterClass
+ public static void tearDownCluster() {
+ TestInjection.reset();
+ }
+
+ @SuppressWarnings({"rawtypes"})
Review comment:
please don't do this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] thelabdude commented on a change in pull request #110: 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
Posted by GitBox <gi...@apache.org>.
thelabdude commented on a change in pull request #110:
URL: https://github.com/apache/solr/pull/110#discussion_r625431819
##########
File path: solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java
##########
@@ -191,91 +270,56 @@ public void testCreateDelete() throws Exception {
}
}
- /**
- * Asserts that Update logs don't exist for replicas of type {@link org.apache.solr.common.cloud.Replica.Type#PULL}
- */
- private void assertUlogPresence(DocCollection collection) {
- for (Slice s:collection.getSlices()) {
- for (Replica r:s.getReplicas()) {
- if (r.getType() == Replica.Type.NRT) {
- continue;
- }
- SolrCore core = null;
- try {
- core = cluster.getReplicaJetty(r).getCoreContainer().getCore(r.getCoreName());
- assertNotNull(core);
- assertFalse("Update log should not exist for replicas of type Passive but file is present: " + core.getUlogDir(),
- new java.io.File(core.getUlogDir()).exists());
- } finally {
- core.close();
- }
- }
- }
- }
-
@SuppressWarnings("unchecked")
- // 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
public void testAddDocs() throws Exception {
- int numPullReplicas = 1 + random().nextInt(3);
+ int numPullReplicas = 1; // + random().nextInt(3);
Review comment:
test is flaky, so the whole test class is still disabled ... I tried to figure out what was causing the failures but couldn't nail it down
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] thelabdude merged pull request #110: 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
Posted by GitBox <gi...@apache.org>.
thelabdude merged pull request #110:
URL: https://github.com/apache/solr/pull/110
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org