You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/08/06 04:15:46 UTC
[13/48] lucene-solr:jira/http2: SOLR-11807: Simply testing of
createNodeSet with restoring collection and fixing the test failure
SOLR-11807: Simply testing of createNodeSet with restoring collection and fixing the test failure
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c9e3c456
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c9e3c456
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c9e3c456
Branch: refs/heads/jira/http2
Commit: c9e3c456e304522c0c37950d520c19c1565625f7
Parents: 96e985a
Author: Varun Thacker <va...@apache.org>
Authored: Tue Jul 31 14:54:50 2018 -0700
Committer: Varun Thacker <va...@apache.org>
Committed: Tue Jul 31 15:19:23 2018 -0700
----------------------------------------------------------------------
.../AbstractCloudBackupRestoreTestCase.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c9e3c456/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
index a78be03..17089b8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -30,7 +29,6 @@ import java.util.TreeMap;
import org.apache.lucene.util.TestUtil;
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.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -294,20 +292,12 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
}
if (rarely()) { // Try with createNodeSet configuration
- List<String> nodeStrs = new ArrayList<>(1);//Always 1 as cluster.getJettySolrRunners().size()=NUM_SHARDS=2
- Iterator<JettySolrRunner> iter = cluster.getJettySolrRunners().iterator();
- nodeStrs.add(iter.next().getNodeName());
- restore.setCreateNodeSet(String.join(",", nodeStrs));
- restore.setCreateNodeSetShuffle(usually());
+ //Always 1 as cluster.getJettySolrRunners().size()=NUM_SHARDS=2
+ restore.setCreateNodeSet(cluster.getJettySolrRunners().get(0).getNodeName());
// we need to double maxShardsPerNode value since we reduced number of available nodes by half.
isMaxShardsPerNodeExternal = true;
- if (restore.getMaxShardsPerNode() != null) {
- computeRestoreMaxShardsPerNode = restore.getMaxShardsPerNode() * 2;
- restore.setMaxShardsPerNode(computeRestoreMaxShardsPerNode);
- } else {
- computeRestoreMaxShardsPerNode = origShardToDocCount.size() * backupReplFactor;
- restore.setMaxShardsPerNode(origShardToDocCount.size() * backupReplFactor);
- }
+ computeRestoreMaxShardsPerNode = origShardToDocCount.size() * restoreReplFactor;
+ restore.setMaxShardsPerNode(computeRestoreMaxShardsPerNode);
}
final int restoreMaxShardsPerNode = computeRestoreMaxShardsPerNode;