You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2017/06/29 16:21:55 UTC
lucene-solr:branch_6x: SOLR-10910: Clean up a few details left over
from pluggable transient core and untangling CoreDescriptor/CoreContainer
references, didn't commit before merging last night
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 48cdc74be -> 9947a811e
SOLR-10910: Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references, didn't commit before merging last night
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9947a811
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9947a811
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9947a811
Branch: refs/heads/branch_6x
Commit: 9947a811e83cc0f848f9ddaa37a4137f19efff1a
Parents: 48cdc74
Author: Erick Erickson <er...@apache.org>
Authored: Thu Jun 29 09:18:56 2017 -0700
Committer: Erick Erickson <er...@apache.org>
Committed: Thu Jun 29 09:19:11 2017 -0700
----------------------------------------------------------------------
.../test/org/apache/solr/cloud/BasicDistributedZkTest.java | 9 ++++++---
.../test/org/apache/solr/cloud/UnloadDistributedZkTest.java | 2 ++
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9947a811/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
index 89f99f3..cc6b004 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -25,8 +25,10 @@ import org.apache.solr.client.solrj.SolrClient;
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.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;
@@ -581,9 +583,10 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
createCmd.setNumShards(numShards);
try {
- assertTrue(CollectionAdminRequest.addReplicaToShard(collection, "shard"+((freezeI%numShards)+1))
- .setCoreName(collection + freezeI)
- .setNode(nodeName).process(client).isSuccess());
+ String core3dataDir = createTempDir(collection).toFile().getAbsolutePath();
+ createCmd.setDataDir(getDataDir(core3dataDir));
+
+ client.request(createCmd);
} catch (SolrServerException | IOException e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9947a811/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
index b3fff74..9c056d7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
@@ -18,8 +18,10 @@ package org.apache.solr.cloud;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;