You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/12/21 12:40:14 UTC
svn commit: r1721134 [36/48] - in /lucene/dev/branches/lucene6835: ./
dev-tools/ dev-tools/eclipse/dot.settings/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/lucene/analysis/morfologik/
dev-tools/scripts/ lucene/ lucene/analysis/ lu...
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java Mon Dec 21 11:39:57 2015
@@ -17,15 +17,28 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.Map;
-import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.Nightly;
+import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
+import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CollectionParams.CollectionAction;
+import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.Utils;
+import org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
+import org.apache.solr.update.processor.DistributingUpdateProcessorFactory;
+import org.apache.zookeeper.KeeperException.NodeExistsException;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,23 +47,49 @@ import org.slf4j.LoggerFactory;
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
@Nightly
public class LeaderInitiatedRecoveryOnShardRestartTest extends AbstractFullDistribZkTestBase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- protected static final transient Logger log = LoggerFactory.getLogger(LeaderInitiatedRecoveryOnShardRestartTest.class);
-
-
- public LeaderInitiatedRecoveryOnShardRestartTest() {
+ public LeaderInitiatedRecoveryOnShardRestartTest() throws Exception {
super();
sliceCount = 1;
+ // we want 3 jetties, but we are using the control jetty as one
fixShardCount(2);
+ useFactory("solr.StandardDirectoryFactory");
+ }
+
+ @BeforeClass
+ public static void before() {
+ // we want more realistic leaderVoteWait so raise from
+ // test default of 10s to 30s.
+ System.setProperty("leaderVoteWait", "300000");
+ }
+
+ @AfterClass
+ public static void after() {
+ System.clearProperty("leaderVoteWait");
}
@Test
public void testRestartWithAllInLIR() throws Exception {
- waitForThingsToLevelOut(30000);
+ // still waiting to be able to properly start with no default collection1,
+ // delete to remove confusion
+ waitForRecoveriesToFinish(false);
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ params.set("action", CollectionAction.DELETE.toString());
+ params.set("name", DEFAULT_COLLECTION);
+ QueryRequest request = new QueryRequest(params);
+ request.setPath("/admin/collections");
+ String baseUrl = ((HttpSolrClient) clients.get(0)).getBaseURL();
+ HttpSolrClient delClient = new HttpSolrClient(baseUrl.substring(0, baseUrl.lastIndexOf("/")));
+ delClient.request(request);
+ delClient.close();
+
String testCollectionName = "all_in_lir";
String shardId = "shard1";
- createCollection(testCollectionName, 1, 2, 1);
+ createCollection(testCollectionName, 1, 3, 1);
+
+ waitForRecoveriesToFinish(testCollectionName, false);
cloudClient.setDefaultCollection(testCollectionName);
@@ -64,20 +103,85 @@ public class LeaderInitiatedRecoveryOnSh
SolrZkClient zkClient = cloudClient.getZkStateReader().getZkClient();
zkClient.makePath("/collections/" + testCollectionName + "/leader_initiated_recovery/" + shardId + "/core_node1", znodeData, true);
zkClient.makePath("/collections/" + testCollectionName + "/leader_initiated_recovery/" + shardId + "/core_node2", znodeData, true);
+ zkClient.makePath("/collections/" + testCollectionName + "/leader_initiated_recovery/" + shardId + "/core_node3", znodeData, true);
- printLayout();
+ // everyone gets a couple docs so that everyone has tlog entries
+ // and won't become leader simply because they have no tlog versions
+ SolrInputDocument doc = new SolrInputDocument();
+ addFields(doc, "id", "1");
+ SolrInputDocument doc2 = new SolrInputDocument();
+ addFields(doc2, "id", "2");
+ cloudClient.add(doc);
+ cloudClient.add(doc2);
+
+ cloudClient.commit();
+
+ assertEquals("We just added 2 docs, we should be able to find them", 2, cloudClient.query(new SolrQuery("*:*")).getResults().getNumFound());
+
+ // randomly add too many docs to peer sync to one replica so that only one random replica is the valid leader
+ // the versions don't matter, they just have to be higher than what the last 2 docs got
+ HttpSolrClient client = (HttpSolrClient) clients.get(random().nextInt(clients.size()));
+ client.setBaseURL(client.getBaseURL().substring(0, client.getBaseURL().lastIndexOf("/")) + "/" + testCollectionName);
+ params = new ModifiableSolrParams();
+ params.set(DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());
+
+ try {
+ for (int i = 0; i < 101; i++) {
+ add(client, params, sdoc("id", 3 + i, "_version_", Long.MAX_VALUE - 1 - i));
+ }
+ } catch (RemoteSolrException e) {
+ // if we got a conflict it's because we tried to send a versioned doc to the leader,
+ // resend without version
+ if (e.getMessage().contains("conflict")) {
+ for (int i = 0; i < 101; i++) {
+ add(client, params, sdoc("id", 3 + i));
+ }
+ }
+ }
+
+ client.commit();
for (JettySolrRunner jetty : jettys) {
ChaosMonkey.stop(jetty);
}
+ ChaosMonkey.stop(controlJetty);
- Thread.sleep(2000);
+ Thread.sleep(10000);
+
+ log.info("Start back up");
for (JettySolrRunner jetty : jettys) {
ChaosMonkey.start(jetty);
}
+ ChaosMonkey.start(controlJetty);
+
+ // recoveries will not finish without SOLR-8075 and SOLR-8367
+ waitForRecoveriesToFinish(testCollectionName, true);
+
+ // now expire each node
+ try {
+ zkClient.makePath("/collections/" + testCollectionName + "/leader_initiated_recovery/" + shardId + "/core_node1", znodeData, true);
+ } catch (NodeExistsException e) {
+
+ }
+ try {
+ zkClient.makePath("/collections/" + testCollectionName + "/leader_initiated_recovery/" + shardId + "/core_node2", znodeData, true);
+ } catch (NodeExistsException e) {
+
+ }
+ try {
+ zkClient.makePath("/collections/" + testCollectionName + "/leader_initiated_recovery/" + shardId + "/core_node3", znodeData, true);
+ } catch (NodeExistsException e) {
+
+ }
+
+ for (JettySolrRunner jetty : jettys) {
+ chaosMonkey.expireSession(jetty);
+ }
+
+ Thread.sleep(2000);
- // recoveries will not finish without SOLR-8075
+ // recoveries will not finish without SOLR-8075 and SOLR-8367
waitForRecoveriesToFinish(testCollectionName, true);
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java Mon Dec 21 11:39:57 2015
@@ -34,8 +34,11 @@ import org.apache.solr.common.util.Utils
import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.KeeperException;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,6 +54,8 @@ public class MigrateRouteKeyTest extends
schemaString = "schema15.xml"; // we need a string id
}
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Test
public void test() throws Exception {
waitForThingsToLevelOut(15);
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Random;
import org.apache.solr.client.solrj.SolrClient;
@@ -41,8 +42,7 @@ import org.slf4j.LoggerFactory;
public class MultiThreadedOCPTest extends AbstractFullDistribZkTestBase {
private static final int REQUEST_STATUS_TIMEOUT = 5 * 60;
- private static Logger log = LoggerFactory
- .getLogger(MultiThreadedOCPTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int NUM_COLLECTIONS = 4;
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java Mon Dec 21 11:39:57 2015
@@ -1,6 +1,7 @@
package org.apache.solr.cloud;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
@@ -36,8 +37,7 @@ import org.slf4j.LoggerFactory;
public class OutOfBoxZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 {
- protected static Logger log = LoggerFactory
- .getLogger(AbstractZkTestCase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Charset DATA_ENCODING = Charset.forName("UTF-8");
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java Mon Dec 21 11:39:57 2015
@@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -47,8 +48,7 @@ import java.util.List;
public class OverriddenZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 {
- protected static Logger log = LoggerFactory
- .getLogger(AbstractZkTestCase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Charset DATA_ENCODING = Charset.forName("UTF-8");
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java Mon Dec 21 11:39:57 2015
@@ -46,7 +46,10 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -74,6 +77,8 @@ import static org.easymock.EasyMock.rese
import static org.easymock.EasyMock.verify;
public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String ADMIN_PATH = "/admin/cores";
private static final String COLLECTION_NAME = "mycollection";
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java Mon Dec 21 11:39:57 2015
@@ -34,8 +34,11 @@ import org.apache.solr.common.util.Utils
import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.data.Stat;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -54,6 +57,8 @@ import static org.apache.solr.common.clo
@SuppressSSL(bugUrl = "SOLR-5776")
public class OverseerRolesTest extends AbstractFullDistribZkTestBase{
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
protected String getSolrXml() {
return "solr-no-core.xml";
}
@@ -177,7 +182,7 @@ public class OverseerRolesTest extends
log.info("leader node {}", leaderJetty.getBaseUrl());
log.info ("current election Queue",
OverseerCollectionConfigSetProcessor.getSortedElectionNodes(client.getZkStateReader().getZkClient(),
- OverseerElectionContext.PATH + LeaderElector.ELECTION_NODE));
+ "/overseer_elect/election"));
ChaosMonkey.stop(leaderJetty);
timeout = new TimeOut(10, TimeUnit.SECONDS);
leaderchanged = false;
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Mon Dec 21 11:39:57 2015
@@ -20,8 +20,10 @@ package org.apache.solr.cloud;
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -63,11 +65,17 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
+import static org.apache.solr.cloud.AbstractDistribZkTestBase.verifyReplicaStatus;
+
@Slow
public class OverseerTest extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
static final int TIMEOUT = 30000;
private static final boolean DEBUG = false;
@@ -76,7 +84,7 @@ public class OverseerTest extends SolrTe
private List<HttpShardHandlerFactory> httpShardHandlerFactorys = new ArrayList<>();
private List<UpdateShardHandler> updateShardHandlers = new ArrayList<>();
- private String collection = "collection1";
+ final private String collection = SolrTestCaseJ4.DEFAULT_TEST_COLLECTION_NAME;
public static class MockZKController{
@@ -253,15 +261,15 @@ public class OverseerTest extends SolrTe
for (int i = 0; i < numShards; i++) {
assertNotNull("shard got no id?", zkController.publishState(collection, "core" + (i+1), "node" + (i+1), Replica.State.ACTIVE, 3));
}
- Map<String,Replica> rmap = reader.getClusterState().getSlice("collection1", "shard1").getReplicasMap();
+ final Map<String,Replica> rmap = reader.getClusterState().getSlice(collection, "shard1").getReplicasMap();
assertEquals(rmap.toString(), 2, rmap.size());
- assertEquals(rmap.toString(), 2, reader.getClusterState().getSlice("collection1", "shard2").getReplicasMap().size());
- assertEquals(rmap.toString(), 2, reader.getClusterState().getSlice("collection1", "shard3").getReplicasMap().size());
+ assertEquals(rmap.toString(), 2, reader.getClusterState().getSlice(collection, "shard2").getReplicasMap().size());
+ assertEquals(rmap.toString(), 2, reader.getClusterState().getSlice(collection, "shard3").getReplicasMap().size());
//make sure leaders are in cloud state
- assertNotNull(reader.getLeaderUrl("collection1", "shard1", 15000));
- assertNotNull(reader.getLeaderUrl("collection1", "shard2", 15000));
- assertNotNull(reader.getLeaderUrl("collection1", "shard3", 15000));
+ assertNotNull(reader.getLeaderUrl(collection, "shard1", 15000));
+ assertNotNull(reader.getLeaderUrl(collection, "shard2", 15000));
+ assertNotNull(reader.getLeaderUrl(collection, "shard3", 15000));
} finally {
if (DEBUG) {
@@ -325,7 +333,7 @@ public class OverseerTest extends SolrTe
// make sure the Overseer is still processing items
for (int i = 0; i < numShards; i++) {
- assertNotNull("shard got no id?", zkController.publishState("collection2", "core" + (i+1), "node" + (i+1), Replica.State.ACTIVE, 3));
+ assertNotNull("shard got no id?", zkController.publishState("collection2", "core" + (i + 1), "node" + (i + 1), Replica.State.ACTIVE, 3));
}
assertEquals(1, reader.getClusterState().getSlice("collection2", "shard1").getReplicasMap().size());
@@ -424,7 +432,7 @@ public class OverseerTest extends SolrTe
cloudStateSliceCount = 0;
reader.updateClusterState();
ClusterState state = reader.getClusterState();
- Map<String,Slice> slices = state.getSlicesMap("collection1");
+ final Map<String,Slice> slices = state.getSlicesMap(collection);
if (slices != null) {
for (String name : slices.keySet()) {
cloudStateSliceCount += slices.get(name).getReplicasMap().size();
@@ -478,7 +486,7 @@ public class OverseerTest extends SolrTe
//make sure leaders are in cloud state
for (int i = 0; i < sliceCount; i++) {
- assertNotNull(reader.getLeaderUrl("collection1", "shard" + (i + 1), 15000));
+ assertNotNull(reader.getLeaderUrl(collection, "shard" + (i + 1), 15000));
}
} finally {
@@ -550,30 +558,30 @@ public class OverseerTest extends SolrTe
ZkNodeProps m = new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.STATE.toLower(),
ZkStateReader.BASE_URL_PROP, "http://127.0.0.1/solr",
ZkStateReader.NODE_NAME_PROP, "node1",
- ZkStateReader.COLLECTION_PROP, "collection1",
+ ZkStateReader.COLLECTION_PROP, collection,
ZkStateReader.CORE_NAME_PROP, "core1",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
q.offer(Utils.toJSON(m));
- waitForCollections(reader, "collection1");
+ waitForCollections(reader, collection);
assertSame(reader.getClusterState().toString(), Replica.State.RECOVERING,
- reader.getClusterState().getSlice("collection1", "shard1").getReplica("core_node1").getState());
+ reader.getClusterState().getSlice(collection, "shard1").getReplica("core_node1").getState());
//publish node state (active)
- m = new ZkNodeProps(Overseer.QUEUE_OPERATION, "state",
+ m = new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.STATE.toLower(),
ZkStateReader.BASE_URL_PROP, "http://127.0.0.1/solr",
ZkStateReader.NODE_NAME_PROP, "node1",
- ZkStateReader.COLLECTION_PROP, "collection1",
+ ZkStateReader.COLLECTION_PROP, collection,
ZkStateReader.CORE_NAME_PROP, "core1",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.ACTIVE.toString());
q.offer(Utils.toJSON(m));
- verifyStatus(reader, "collection1", "shard1", "core_node1", Replica.State.ACTIVE);
+ verifyReplicaStatus(reader, "collection1", "shard1", "core_node1", Replica.State.ACTIVE);
} finally {
@@ -584,22 +592,6 @@ public class OverseerTest extends SolrTe
server.shutdown();
}
}
-
- private void verifyStatus(ZkStateReader reader, String collection, String shard, String coreNodeName, Replica.State expectedState) throws InterruptedException {
- int maxIterations = 100;
- Replica.State coreState = null;
- while(maxIterations-->0) {
- Slice slice = reader.getClusterState().getSlice(collection, shard);
- if(slice!=null) {
- coreState = slice.getReplicasMap().get(coreNodeName).getState();
- if(coreState == expectedState) {
- return;
- }
- }
- Thread.sleep(50);
- }
- fail("Illegal state, was: " + coreState + " expected:" + expectedState + " clusterState:" + reader.getClusterState());
- }
private void verifyShardLeader(ZkStateReader reader, String collection, String shard, String expectedCore) throws InterruptedException, KeeperException {
int maxIterations = 200;
@@ -629,6 +621,12 @@ public class OverseerTest extends SolrTe
SolrZkClient zkClient = null;
try {
+
+ final String core = "core1";
+ final String core_node = "core_node1";
+ final String shard = "shard1";
+ final int numShards = 1;
+
server.run();
AbstractZkTestCase.tryCleanSolrZkNode(server.getZkHost());
@@ -646,40 +644,43 @@ public class OverseerTest extends SolrTe
overseerClient = electNewOverseer(server.getZkAddress());
Thread.sleep(1000);
- mockController.publishState(collection, "core1", "core_node1", Replica.State.RECOVERING, 1);
+ mockController.publishState(collection, core, core_node,
+ Replica.State.RECOVERING, numShards);
waitForCollections(reader, collection);
- verifyStatus(reader, collection, "shard1", "core_node1", Replica.State.RECOVERING);
+ verifyReplicaStatus(reader, collection, "shard1", "core_node1", Replica.State.RECOVERING);
int version = getClusterStateVersion(zkClient);
- mockController.publishState(collection, "core1", "core_node1", Replica.State.ACTIVE, 1);
+ mockController.publishState(collection, core, core_node, Replica.State.ACTIVE,
+ numShards);
while (version == getClusterStateVersion(zkClient));
-
- verifyStatus(reader, collection, "shard1", "core_node1", Replica.State.ACTIVE);
+
+ verifyReplicaStatus(reader, collection, "shard1", "core_node1", Replica.State.ACTIVE);
version = getClusterStateVersion(zkClient);
overseerClient.close();
Thread.sleep(1000); // wait for overseer to get killed
- mockController.publishState(collection, "core1", "core_node1", Replica.State.RECOVERING, 1);
+ mockController.publishState(collection, core, core_node,
+ Replica.State.RECOVERING, numShards);
version = getClusterStateVersion(zkClient);
overseerClient = electNewOverseer(server.getZkAddress());
while (version == getClusterStateVersion(zkClient));
-
- verifyStatus(reader, collection, "shard1", "core_node1", Replica.State.RECOVERING);
+
+ verifyReplicaStatus(reader, collection, "shard1", "core_node1", Replica.State.RECOVERING);
assertEquals("Live nodes count does not match", 1, reader
.getClusterState().getLiveNodes().size());
- assertEquals("Shard count does not match", 1, reader.getClusterState()
- .getSlice(collection, "shard1").getReplicasMap().size());
+ assertEquals(shard+" replica count does not match", 1, reader.getClusterState()
+ .getSlice(collection, shard).getReplicasMap().size());
version = getClusterStateVersion(zkClient);
- mockController.publishState(collection, "core1", "core_node1", null, 1);
+ mockController.publishState(collection, core, core_node, null, numShards);
while (version == getClusterStateVersion(zkClient));
Thread.sleep(500);
- assertFalse("collection1 should be gone after publishing the null state",
+ assertFalse(collection+" should be gone after publishing the null state",
reader.getClusterState().hasCollection(collection));
} finally {
close(mockController);
@@ -730,10 +731,10 @@ public class OverseerTest extends SolrTe
overseerElector.setup(ec);
overseerElector.joinElection(ec, false);
- mockController.publishState(collection, "core1", "core_node1", Replica.State.RECOVERING, 1);
+ mockController.publishState(collection, "core1", "core_node1", Replica.State.ACTIVE, 1);
assertNotNull(overseer.getStats());
- assertEquals(1, (overseer.getStats().getSuccessCount(OverseerAction.STATE.toLower())));
+ assertTrue((overseer.getStats().getSuccessCount(OverseerAction.STATE.toLower())) > 0);
// shut it down
overseer.close();
@@ -833,11 +834,11 @@ public class OverseerTest extends SolrTe
mockController.publishState(collection, "core1", "node1",Replica.State.RECOVERING,1);
mockController2 = new MockZKController(server.getZkAddress(), "node2");
mockController.publishState(collection, "core1", "node1", Replica.State.ACTIVE,1);
- verifyShardLeader(reader, "collection1", "shard1", "core1");
+ verifyShardLeader(reader, collection, "shard1", "core1");
mockController2.publishState(collection, "core4", "node2", Replica.State.ACTIVE ,1);
mockController.close();
mockController = null;
- verifyShardLeader(reader, "collection1", "shard1", "core4");
+ verifyShardLeader(reader, collection, "shard1", "core4");
}
} finally {
if (killer != null) {
@@ -883,8 +884,8 @@ public class OverseerTest extends SolrTe
mockController.publishState(collection, "core1", "core_node1", Replica.State.RECOVERING, 1);
waitForCollections(reader, "collection1");
-
- verifyStatus(reader, collection, "shard1", "core_node1", Replica.State.RECOVERING);
+
+ verifyReplicaStatus(reader, collection, "shard1", "core_node1", Replica.State.RECOVERING);
mockController.close();
@@ -946,9 +947,9 @@ public class OverseerTest extends SolrTe
mockController.publishState(collection, "core1", "node1", Replica.State.RECOVERING, 12);
- waitForCollections(reader, "collection1");
+ waitForCollections(reader, collection);
- assertEquals("Slicecount does not match", 12, reader.getClusterState().getSlices("collection1").size());
+ assertEquals("Slicecount does not match", 12, reader.getClusterState().getSlices(collection).size());
} finally {
close(overseerClient);
@@ -1115,11 +1116,11 @@ public class OverseerTest extends SolrTe
reader.createClusterStateWatchersAndUpdate();
//prepopulate work queue with some items to emulate previous overseer died before persisting state
DistributedQueue queue = Overseer.getInternalQueue(zkClient, new Overseer.Stats());
- ZkNodeProps m = new ZkNodeProps(Overseer.QUEUE_OPERATION, "state",
+ ZkNodeProps m = new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.STATE.toLower(),
ZkStateReader.BASE_URL_PROP, "http://127.0.0.1/solr",
ZkStateReader.NODE_NAME_PROP, "node1",
ZkStateReader.SHARD_ID_PROP, "s1",
- ZkStateReader.COLLECTION_PROP, "collection1",
+ ZkStateReader.COLLECTION_PROP, collection,
ZkStateReader.CORE_NAME_PROP, "core1",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
@@ -1128,7 +1129,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.BASE_URL_PROP, "http://127.0.0.1/solr",
ZkStateReader.NODE_NAME_PROP, "node1",
ZkStateReader.SHARD_ID_PROP, "s1",
- ZkStateReader.COLLECTION_PROP, "collection1",
+ ZkStateReader.COLLECTION_PROP, collection,
ZkStateReader.CORE_NAME_PROP, "core2",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
@@ -1142,19 +1143,19 @@ public class OverseerTest extends SolrTe
ZkStateReader.BASE_URL_PROP, "http://127.0.0.1/solr",
ZkStateReader.NODE_NAME_PROP, "node1",
ZkStateReader.SHARD_ID_PROP, "s1",
- ZkStateReader.COLLECTION_PROP, "collection1",
+ ZkStateReader.COLLECTION_PROP, collection,
ZkStateReader.CORE_NAME_PROP, "core3",
ZkStateReader.ROLES_PROP, "",
ZkStateReader.STATE_PROP, Replica.State.RECOVERING.toString());
queue.offer(Utils.toJSON(m));
for(int i=0;i<100;i++) {
- Slice s = reader.getClusterState().getSlice("collection1", "s1");
+ Slice s = reader.getClusterState().getSlice(collection, "s1");
if(s!=null && s.getReplicasMap().size()==3) break;
Thread.sleep(100);
}
- assertNotNull(reader.getClusterState().getSlice("collection1", "s1"));
- assertEquals(3, reader.getClusterState().getSlice("collection1", "s1").getReplicasMap().size());
+ assertNotNull(reader.getClusterState().getSlice(collection, "s1"));
+ assertEquals(3, reader.getClusterState().getSlice(collection, "s1").getReplicasMap().size());
} finally {
close(overseerClient);
close(zkClient);
@@ -1201,7 +1202,7 @@ public class OverseerTest extends SolrTe
q.offer(Utils.toJSON(m));
waitForCollections(reader, "c1");
- verifyStatus(reader, "c1", "shard1", "core_node1", Replica.State.DOWN);
+ verifyReplicaStatus(reader, "c1", "shard1", "core_node1", Replica.State.DOWN);
m = new ZkNodeProps(Overseer.QUEUE_OPERATION, OverseerAction.STATE.toLower(),
ZkStateReader.BASE_URL_PROP, "http://127.0.0.1/solr",
@@ -1255,10 +1256,10 @@ public class OverseerTest extends SolrTe
q.offer(Utils.toJSON(m));
waitForCollections(reader, "test");
- verifyStatus(reader, "test", "x", "core_node1", Replica.State.DOWN);
+ verifyReplicaStatus(reader, "test", "x", "core_node1", Replica.State.DOWN);
waitForCollections(reader, "c1");
- verifyStatus(reader, "c1", "shard1", "core_node1", Replica.State.ACTIVE);
+ verifyReplicaStatus(reader, "c1", "shard1", "core_node1", Replica.State.ACTIVE);
} finally {
close(zkClient);
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java Mon Dec 21 11:39:57 2015
@@ -26,14 +26,11 @@ import org.apache.solr.client.solrj.embe
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.ZkStateReader;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Slow
public class RecoveryZkTest extends AbstractFullDistribZkTestBase {
//private static final String DISTRIB_UPDATE_CHAIN = "distrib-update-chain";
- private static Logger log = LoggerFactory.getLogger(RecoveryZkTest.class);
private StoppableIndexingThread indexThread;
private StoppableIndexingThread indexThread2;
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.List;
@@ -50,8 +51,7 @@ import org.slf4j.LoggerFactory;
@LuceneTestCase.BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-6944")
public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
- private static final transient Logger log =
- LoggerFactory.getLogger(ReplicationFactorTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ReplicationFactorTest() {
super();
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java Mon Dec 21 11:39:57 2015
@@ -20,18 +20,18 @@ package org.apache.solr.cloud;
import org.apache.commons.collections.CollectionUtils;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.params.CollectionParams;
import org.apache.zookeeper.KeeperException;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
public class RollingRestartTest extends AbstractFullDistribZkTestBase {
- public static Logger log = LoggerFactory.getLogger(ChaosMonkeyNothingIsSafeTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final long MAX_WAIT_TIME = TimeUnit.NANOSECONDS.convert(300, TimeUnit.SECONDS);
@@ -97,7 +97,7 @@ public class RollingRestartTest extends
if (leader == null)
log.error("NOOVERSEER election queue is :" +
OverseerCollectionConfigSetProcessor.getSortedElectionNodes(cloudClient.getZkStateReader().getZkClient(),
- OverseerElectionContext.PATH + LeaderElector.ELECTION_NODE));
+ "/overseer_elect/election"));
fail("No overseer designate as leader found after restart #" + (i + 1) + ": " + leader);
}
}
@@ -108,7 +108,7 @@ public class RollingRestartTest extends
if (leader == null)
log.error("NOOVERSEER election queue is :" +
OverseerCollectionConfigSetProcessor.getSortedElectionNodes(cloudClient.getZkStateReader().getZkClient(),
- OverseerElectionContext.PATH + LeaderElector.ELECTION_NODE));
+ "/overseer_elect/election"));
fail("No overseer leader found after restart #" + (i + 1) + ": " + leader);
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java Mon Dec 21 11:39:57 2015
@@ -2,6 +2,7 @@ package org.apache.solr.cloud;
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.util.Locale;
@@ -46,8 +47,7 @@ import com.carrotsearch.randomizedtestin
})
public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
- protected static Logger log = LoggerFactory
- .getLogger(SaslZkACLProviderTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Charset DATA_ENCODING = Charset.forName("UTF-8");
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java Mon Dec 21 11:39:57 2015
@@ -24,13 +24,18 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.common.params.ShardParams;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.Map;
public class ShardRoutingTest extends AbstractFullDistribZkTestBase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
String bucket1 = "shard1"; // shard1: top bits:10 80000000:bfffffff
String bucket2 = "shard2"; // shard2: top bits:11 c0000000:ffffffff
String bucket3 = "shard3"; // shard3: top bits:00 00000000:3fffffff
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java Mon Dec 21 11:39:57 2015
@@ -40,8 +40,11 @@ import org.apache.solr.common.params.Col
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.Utils;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -57,6 +60,8 @@ import static org.apache.solr.common.clo
@Slow
public class ShardSplitTest extends BasicDistributedZkTest {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public static final String SHARD1_0 = SHARD1 + "_0";
public static final String SHARD1_1 = SHARD1 + "_1";
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java Mon Dec 21 11:39:57 2015
@@ -19,6 +19,7 @@ package org.apache.solr.cloud;
import java.io.File;
import java.io.FilenameFilter;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
@LuceneTestCase.BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-8135")
public class SolrCloudExampleTest extends AbstractFullDistribZkTestBase {
- protected static final transient Logger log = LoggerFactory.getLogger(SolrCloudExampleTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public SolrCloudExampleTest() {
super();
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java Mon Dec 21 11:39:57 2015
@@ -16,8 +16,13 @@ package org.apache.solr.cloud;
* the License.
*/
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Properties;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
@@ -25,18 +30,17 @@ import org.apache.solr.common.cloud.Solr
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.NodeConfig;
import org.apache.solr.servlet.SolrDispatchFilter;
-import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SolrXmlInZkTest extends SolrTestCaseJ4 {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Rule
public TestRule solrTestRules = RuleChain.outerRule(new SystemPropertiesRestoreRule());
@@ -51,11 +55,11 @@ public class SolrXmlInZkTest extends Sol
private NodeConfig cfg;
private void setUpZkAndDiskXml(boolean toZk, boolean leaveOnLocal) throws Exception {
- File tmpDir = createTempDir().toFile();
- File solrHome = new File(tmpDir, "home");
- copyMinConf(new File(solrHome, "myCollect"));
+ Path tmpDir = createTempDir();
+ Path solrHome = tmpDir.resolve("home");
+ copyMinConf(new File(solrHome.toFile(), "myCollect"));
if (leaveOnLocal) {
- FileUtils.copyFile(new File(SolrTestCaseJ4.TEST_HOME(), "solr-stress-new.xml"), new File(solrHome, "solr.xml"));
+ FileUtils.copyFile(new File(SolrTestCaseJ4.TEST_HOME(), "solr-stress-new.xml"), new File(solrHome.toFile(), "solr.xml"));
}
ignoreException("No UpdateLog found - cannot sync");
@@ -63,8 +67,7 @@ public class SolrXmlInZkTest extends Sol
System.setProperty("zkClientTimeout", "8000");
- zkDir = tmpDir.getAbsolutePath() + File.separator
- + "zookeeper" + System.nanoTime() + "/server1/data";
+ zkDir = tmpDir.resolve("zookeeper" + System.nanoTime()).resolve("server1").resolve("data").toString();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
System.setProperty("zkHost", zkServer.getZkAddress());
@@ -86,7 +89,7 @@ public class SolrXmlInZkTest extends Sol
props.setProperty("solr.test.sys.prop1", "propone");
props.setProperty("solr.test.sys.prop2", "proptwo");
- cfg = SolrDispatchFilter.loadNodeConfig(solrHome.getAbsolutePath(), props);
+ cfg = SolrDispatchFilter.loadNodeConfig(solrHome, props);
log.info("####SETUP_END " + getTestName());
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import org.apache.http.HttpException;
@@ -52,6 +53,8 @@ import org.slf4j.LoggerFactory;
@SuppressSysoutChecks(bugUrl = "Solr logs to JUL")
public class TestAuthenticationFramework extends TestMiniSolrCloudCluster {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public TestAuthenticationFramework () {
NUM_SERVERS = 5;
NUM_SHARDS = 2;
@@ -84,20 +87,17 @@ public class TestAuthenticationFramework
}
@Test
- @Override
public void testBasics() throws Exception {
- final String collectionName = "testAuthenticationFrameworkCollection";
-
// Should pass
- testCollectionCreateSearchDelete(collectionName);
+ testCollectionCreateSearchDelete();
MockAuthenticationPlugin.expectedUsername = "solr";
MockAuthenticationPlugin.expectedPassword = "s0lrRocks";
// Should fail with 401
try {
- testCollectionCreateSearchDelete(collectionName);
+ testCollectionCreateSearchDelete();
fail("Should've returned a 401 error");
} catch (Exception ex) {
if (!ex.getMessage().contains("Error 401")) {
@@ -116,8 +116,6 @@ public class TestAuthenticationFramework
}
public static class MockAuthenticationPlugin extends AuthenticationPlugin implements HttpClientInterceptorPlugin {
- private static Logger log = LoggerFactory.getLogger(MockAuthenticationPlugin.class);
-
public static String expectedUsername;
public static String expectedPassword;
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java Mon Dec 21 11:39:57 2015
@@ -1,5 +1,7 @@
package org.apache.solr.cloud;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,12 +28,8 @@ import org.apache.solr.common.SolrDocume
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class TestCloudInspectUtil extends SolrTestCaseJ4 {
- protected static Logger log = LoggerFactory.getLogger(TestCloudInspectUtil.class);
-
@Override
@Before
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java Mon Dec 21 11:39:57 2015
@@ -36,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
@@ -79,7 +80,7 @@ import static org.apache.solr.common.par
@SuppressSSL // Too Slow
public class TestCloudPivotFacet extends AbstractFullDistribZkTestBase {
- public static Logger log = LoggerFactory.getLogger(TestCloudPivotFacet.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// param used by test purely for tracing & validation
private static String TRACE_MIN = "_test_min";
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java Mon Dec 21 11:39:57 2015
@@ -17,7 +17,6 @@
package org.apache.solr.cloud;
-import com.google.common.collect.ImmutableMap;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStreamReader;
@@ -29,6 +28,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import com.google.common.collect.ImmutableMap;
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
@@ -48,11 +48,11 @@ import org.apache.solr.common.util.Named
import org.apache.solr.common.util.Utils;
import org.apache.solr.core.ConfigSetProperties;
import org.apache.zookeeper.KeeperException;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import static org.apache.solr.cloud.OverseerConfigSetMessageHandler.BASE_CONFIGSET;
import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.core.ConfigSetProperties.DEFAULT_FILENAME;
@@ -68,8 +68,7 @@ public class TestConfigSetsAPI extends S
@Before
public void setUp() throws Exception {
super.setUp();
- final File solrXml = getFile("solr").toPath().resolve("solr.xml").toFile();
- solrCluster = new MiniSolrCloudCluster(1, createTempDir().toFile(), solrXml, buildJettyConfig("/solr"));
+ solrCluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
}
@Override
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@
package org.apache.solr.cloud;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
@@ -44,8 +45,7 @@ import org.slf4j.LoggerFactory;
* the same ConfigSet and base ConfigSet.
*/
public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {
- private static Logger log = LoggerFactory
- .getLogger(TestConfigSetsAPIExclusivity.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private MiniSolrCloudCluster solrCluster;
private static final String GRANDBASE_CONFIGSET_NAME = "grandBaseConfigSet1";
@@ -56,10 +56,7 @@ public class TestConfigSetsAPIExclusivit
@Before
public void setUp() throws Exception {
super.setUp();
- final File solrXml = getFile("solr").toPath().resolve("solr.xml").toFile();
- final File testDir = createTempDir().toFile();
- solrCluster = new MiniSolrCloudCluster(1, testDir,
- solrXml, buildJettyConfig("/solr"));
+ solrCluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
}
@Override
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java Mon Dec 21 11:39:57 2015
@@ -17,11 +17,11 @@
package org.apache.solr.cloud;
-import com.google.common.collect.ImmutableMap;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedList;
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import com.google.common.collect.ImmutableMap;
import org.apache.commons.io.FileUtils;
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
@@ -40,7 +41,6 @@ import org.apache.solr.client.solrj.impl
import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
import org.apache.solr.client.solrj.request.ConfigSetAdminRequest.Create;
import org.apache.solr.client.solrj.response.ConfigSetAdminResponse;
-import org.apache.solr.cloud.ZkTestServer;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkConfigManager;
@@ -51,15 +51,14 @@ import org.apache.zookeeper.KeeperExcept
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.server.quorum.Leader.Proposal;
import org.apache.zookeeper.server.DataNode;
import org.apache.zookeeper.server.DataTree;
import org.apache.zookeeper.server.DataTree.ProcessTxnResult;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.ServerCnxn;
import org.apache.zookeeper.server.ZKDatabase;
+import org.apache.zookeeper.server.quorum.Leader.Proposal;
import org.apache.zookeeper.txn.TxnHeader;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -82,16 +81,13 @@ public class TestConfigSetsAPIZkFailure
@Before
public void setUp() throws Exception {
super.setUp();
- final File solrXml = getFile("solr").toPath().resolve("solr.xml").toFile();
- final File testDir = createTempDir().toFile();
- String zkDir = testDir.getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ final Path testDir = createTempDir();
+ String zkDir = testDir.resolve("zookeeper/server1/data").toString();
zkTestServer = new ZkTestServer(zkDir);
zkTestServer.run();
- zkTestServer.setZKDatabase(
- new FailureDuringCopyZKDatabase(zkTestServer.getZKDatabase(), zkTestServer));
+ zkTestServer.setZKDatabase(new FailureDuringCopyZKDatabase(zkTestServer.getZKDatabase(), zkTestServer));
solrCluster = new MiniSolrCloudCluster(1, testDir,
- solrXml, buildJettyConfig("/solr"), zkTestServer);
+ MiniSolrCloudCluster.DEFAULT_CLOUD_SOLR_XML, buildJettyConfig("/solr"), zkTestServer);
}
@Override
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java Mon Dec 21 11:39:57 2015
@@ -38,14 +38,11 @@ import org.apache.solr.util.RESTfulServe
import org.apache.solr.util.RestTestHarness;
import org.apache.zookeeper.CreateMode;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static java.util.Arrays.asList;
import static org.apache.solr.handler.TestSolrConfigHandlerCloud.compareValues;
public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
- private static final Logger logger = LoggerFactory.getLogger(TestCryptoKeys.class);
private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
private void setupHarnesses() {
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java Mon Dec 21 11:39:57 2015
@@ -25,7 +25,10 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.util.StrUtils;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -35,6 +38,8 @@ import java.util.Set;
public class TestDistribDocBasedVersion extends AbstractFullDistribZkTestBase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
String bucket1 = "shard1"; // shard1: top bits:10 80000000:ffffffff
String bucket2 = "shard2"; // shard2: top bits:00 00000000:7fffffff
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java Mon Dec 21 11:39:57 2015
@@ -18,12 +18,15 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.ShardParams;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.hamcrest.CoreMatchers.is;
@@ -34,6 +37,8 @@ import static org.hamcrest.CoreMatchers.
*/
public class TestDownShardTolerantSearch extends AbstractFullDistribZkTestBase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public TestDownShardTolerantSearch() {
sliceCount = 2;
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java Mon Dec 21 11:39:57 2015
@@ -17,6 +17,12 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.core.CloudConfig;
@@ -24,12 +30,13 @@ import org.apache.solr.core.CoreContaine
import org.apache.solr.core.CoreDescriptor;
import org.apache.zookeeper.KeeperException;
import org.junit.Test;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public static final String SOLRXML = "<solr></solr>";
private static final int MAX_NODES = 16;
private static final int MIN_NODES = 4;
@@ -37,7 +44,7 @@ public class TestLeaderElectionZkExpiry
@Test
public void testLeaderElectionWithZkExpiry() throws Exception {
String zkDir = createTempDir("zkData").toFile().getAbsolutePath();
- String ccDir = createTempDir("testLeaderElectionWithZkExpiry-solr").toFile().getAbsolutePath();
+ Path ccDir = createTempDir("testLeaderElectionWithZkExpiry-solr");
CoreContainer cc = createCoreContainer(ccDir, SOLRXML);
final ZkTestServer server = new ZkTestServer(zkDir);
server.setTheTickTime(1000);
Modified: lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java Mon Dec 21 11:39:57 2015
@@ -1,6 +1,18 @@
package org.apache.solr.cloud;
import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.ZkCoreNodeProps;
+import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.util.MockCoreContainer.MockCoreDescriptor;
+import org.apache.solr.util.TimeOut;
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.data.Stat;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,19 +31,6 @@ import java.util.Properties;
* limitations under the License.
*/
-import java.util.concurrent.TimeUnit;
-
-import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.cloud.ZkCoreNodeProps;
-import org.apache.solr.common.cloud.ZkStateReader;
-import org.apache.solr.servlet.SolrDispatchFilter;
-import org.apache.solr.util.TimeOut;
-import org.apache.solr.util.MockCoreContainer.MockCoreDescriptor;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.data.Stat;
-
/**
* Test for {@link LeaderInitiatedRecoveryThread}
*/
@@ -48,8 +47,8 @@ public class TestLeaderInitiatedRecovery
final String leaderCoreNodeName = shardToLeaderJetty.get(SHARD1).coreNodeName;
final CloudJettyRunner leaderRunner = shardToLeaderJetty.get(SHARD1);
- SolrDispatchFilter filter = (SolrDispatchFilter) leaderRunner.jetty.getDispatchFilter().getFilter();
- ZkController zkController = filter.getCores().getZkController();
+ CoreContainer coreContainer = leaderRunner.jetty.getCoreContainer();
+ ZkController zkController = coreContainer.getZkController();
CloudJettyRunner notLeader = null;
for (CloudJettyRunner cloudJettyRunner : shardToJetty.get(SHARD1)) {
@@ -82,7 +81,7 @@ public class TestLeaderInitiatedRecovery
*/
try {
- LeaderInitiatedRecoveryThread thread = new LeaderInitiatedRecoveryThread(zkController, filter.getCores(),
+ LeaderInitiatedRecoveryThread thread = new LeaderInitiatedRecoveryThread(zkController, coreContainer,
DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, cd);
assertFalse(zkController.isReplicaInRecoveryHandling(replicaCoreNodeProps.getCoreUrl()));
thread.run();
@@ -95,7 +94,7 @@ public class TestLeaderInitiatedRecovery
/*
2. Test that a non-live replica cannot be put into LIR or down state
*/
- LeaderInitiatedRecoveryThread thread = new LeaderInitiatedRecoveryThread(zkController, filter.getCores(),
+ LeaderInitiatedRecoveryThread thread = new LeaderInitiatedRecoveryThread(zkController, coreContainer,
DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, cd);
// kill the replica
int children = cloudClient.getZkStateReader().getZkClient().getChildren("/live_nodes", null, true).size();
@@ -126,7 +125,7 @@ public class TestLeaderInitiatedRecovery
ChaosMonkey.start(notLeader.jetty);
waitForRecoveriesToFinish(true);
- thread = new LeaderInitiatedRecoveryThread(zkController, filter.getCores(),
+ thread = new LeaderInitiatedRecoveryThread(zkController, coreContainer,
DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, cd) {
@Override
protected void updateLIRState(String replicaCoreNodeName) {
@@ -141,7 +140,7 @@ public class TestLeaderInitiatedRecovery
/*
4. Test that if ZK connection loss or session expired then thread should not attempt to publish down state even if forcePublish=true
*/
- thread = new LeaderInitiatedRecoveryThread(zkController, filter.getCores(),
+ thread = new LeaderInitiatedRecoveryThread(zkController, coreContainer,
DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, cd) {
@Override
protected void updateLIRState(String replicaCoreNodeName) {
@@ -156,7 +155,7 @@ public class TestLeaderInitiatedRecovery
/*
5. Test that any exception other then ZK connection loss or session expired should publish down state only if forcePublish=true
*/
- thread = new LeaderInitiatedRecoveryThread(zkController, filter.getCores(),
+ thread = new LeaderInitiatedRecoveryThread(zkController, coreContainer,
DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, cd) {
@Override
protected void updateLIRState(String replicaCoreNodeName) {
@@ -191,12 +190,12 @@ public class TestLeaderInitiatedRecovery
/*
6. Test that non-leader cannot set LIR nodes
*/
-
- filter = (SolrDispatchFilter) notLeader.jetty.getDispatchFilter().getFilter();
- zkController = filter.getCores().getZkController();
- thread = new LeaderInitiatedRecoveryThread(zkController, filter.getCores(),
- DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, filter.getCores().getCores().iterator().next().getCoreDescriptor()) {
+ coreContainer = notLeader.jetty.getCoreContainer();
+ zkController = coreContainer.getZkController();
+
+ thread = new LeaderInitiatedRecoveryThread(zkController, coreContainer,
+ DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, coreContainer.getCores().iterator().next().getCoreDescriptor()) {
@Override
protected void updateLIRState(String replicaCoreNodeName) {
try {
@@ -215,10 +214,10 @@ public class TestLeaderInitiatedRecovery
7. assert that we can write a LIR state if everything else is fine
*/
// reset the zkcontroller to the one from the leader
- filter = (SolrDispatchFilter) leaderRunner.jetty.getDispatchFilter().getFilter();
- zkController = filter.getCores().getZkController();
- thread = new LeaderInitiatedRecoveryThread(zkController, filter.getCores(),
- DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, filter.getCores().getCores().iterator().next().getCoreDescriptor());
+ coreContainer = leaderRunner.jetty.getCoreContainer();
+ zkController = coreContainer.getZkController();
+ thread = new LeaderInitiatedRecoveryThread(zkController, coreContainer,
+ DEFAULT_COLLECTION, SHARD1, replicaCoreNodeProps, 1, coreContainer.getCores().iterator().next().getCoreDescriptor());
thread.publishDownState(replicaCoreNodeProps.getCoreName(), replica.getName(), replica.getNodeName(), replicaCoreNodeProps.getCoreUrl(), false);
timeOut = new TimeOut(30, TimeUnit.SECONDS);
while (!timeOut.hasTimedOut()) {