Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11985 : Added a test for pecentage with replica type

This commit is contained in:
noble 2018-06-26 22:48:46 +10:00
parent c33bb65cf6
commit 7fb36c5906
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
View File

@ -174,6 +174,7 @@ public class Suggestion {
row.forEachReplica(replicaInfo -> { row.forEachReplica(replicaInfo -> {
if (replicaInfo.getCollection().equals(collection)) { if (replicaInfo.getCollection().equals(collection)) {
if (clause.getShard().op == Operand.WILDCARD || replicaInfo.getShard().equals(shard)) { if (clause.getShard().op == Operand.WILDCARD || replicaInfo.getShard().equals(shard)) {
if(cv.getClause().type == null || replicaInfo.getType() == cv.getClause().type)
totalReplicasOfInterest.incrementAndGet(); totalReplicasOfInterest.incrementAndGet();
} }
} }

27
solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
View File

@ -1597,6 +1597,33 @@ public class TestPolicy extends SolrTestCaseJ4 {
session = autoScalingConfig.getPolicy().createSession(cloudManagerWithData(dataproviderdata)); session = autoScalingConfig.getPolicy().createSession(cloudManagerWithData(dataproviderdata));
violations = session.getViolations(); violations = session.getViolations();
assertEquals(0, violations.size()); assertEquals(0, violations.size());
dataproviderdata = "{" +
" 'liveNodes':[" +
" '10.0.0.6:7574_solr'," +
" '10.0.0.6:8983_solr']," +
" 'replicaInfo':{" +
" '10.0.0.6:7574_solr':{}," +
" '10.0.0.6:8983_solr':{'mycoll1':{" +
" 'shard1':[{'core_node4':{'type':'PULL'}}]," +
" 'shard1':[{'core_node3':{'type':'PULL'}}]," +
" 'shard3':[{'core_node2':{'type':'TLOG'}}]," +
" 'shard2':[{'core_node1':{'type':'TLOG'}}]}}}," +
" 'nodeValues':{" +
" '10.0.0.6:7574_solr':{" +
" 'node':'10.0.0.6:7574_solr'," +
" 'cores':0}," +
" '10.0.0.6:8983_solr':{" +
" 'node':'10.0.0.6:8983_solr'," +
" 'cores':2}}}";
autoScalingjson = " { cluster-policy:[" +
" { replica :'<51%',node:'#ANY' , type: TLOG } ,{ replica :'<51%',node:'#ANY' , type: PULL } ]," +
" cluster-preferences :[{ minimize : cores }]}";
autoScalingConfig = new AutoScalingConfig((Map<String, Object>) Utils.fromJSONString(autoScalingjson));
session = autoScalingConfig.getPolicy().createSession(cloudManagerWithData(dataproviderdata));
violations = session.getViolations();
assertEquals(2, violations.size());
} }
public void testReplicaZonesPercentage() { public void testReplicaZonesPercentage() {