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

SOLR-13504 improve autoscaling syntax by adding a nodeset attribute (#693) 

* SOLR-13504:  more checks and tests
This commit is contained in:
Noble Paul 2019-06-02 18:54:28 +10:00 committed by GitHub
parent b28de243be
commit 808f934cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
View File

@ -57,13 +57,13 @@ import static org.apache.solr.common.util.Utils.toJSONString;
*/
public class Clause implements MapWriter, Comparable<Clause> {
public static final String NODESET = "nodeset";
private static final Set<String> IGNORE_TAGS = new HashSet<>(Arrays.asList(REPLICA, COLLECTION, SHARD, "strict", "type", "put", NODESET));
static final Set<String> IGNORE_TAGS = new HashSet<>(Arrays.asList(REPLICA, COLLECTION, SHARD, "strict", "type", "put", NODESET));
private final int hashCode;
final boolean hasComputedValue;
final Map<String, Object> original;
final Clause derivedFrom;
private boolean nodeSetPresent = false;
boolean nodeSetPresent = false;
Condition collection, shard, replica, tag, globalTag;
final Replica.Type type;
boolean strict;
@ -568,10 +568,6 @@ public class Clause implements MapWriter, Comparable<Clause> {
public List<Violation> test(Policy.Session session, double[] deviations) {
if (isPerCollectiontag()) {
if(nodeSetPresent) {
}
return tag.varType == Type.NODE ||
(tag.varType.meta.isNodeSpecificVal() && replica.computedType == null) ?
testPerNode(session, deviations) :

9
solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
View File

@ -45,6 +45,15 @@ public class VariableBase implements Variable {
}
}
@Override
public String postValidate(Condition condition) {
if(Clause.IGNORE_TAGS.contains(condition.getName())) return null;
if(condition.getOperand() == Operand.WILDCARD && condition.clause.nodeSetPresent){
return "#EACH not supported in tags in nodeset";
}
return null;
}
static Object getOperandAdjustedValue(Object val, Object original) {
if (original instanceof Condition) {
Condition condition = (Condition) original;

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

@ -706,6 +706,12 @@ public class TestPolicy extends SolrTestCaseJ4 {
assertEquals(Variable.Type.NODE, clause.tag.varType);
assertEquals(Operand.IN, clause.tag.op);
expectThrows(IllegalArgumentException.class,
() -> Clause.create("{replica:1, nodeset : {sysprop.zone : '#EACH'}}"));
expectThrows(IllegalArgumentException.class,
() -> Clause.create("{replica:1, nodeset : {host : '#EACH'}}"));
expectThrows(IllegalArgumentException.class,
() -> Clause.create("{replica:1, node: n1, nodeset : {sysprop.zone : east}}"));
@ -1912,7 +1918,7 @@ public class TestPolicy extends SolrTestCaseJ4 {
"{replica:0, nodeset:{'nodeRole':'overseer'},'strict':false}," +
"{'replica':'<1','node':'node3'}," +
"{'replica':'<2','node':'#ANY','shard':'#EACH'}," +
"{'replica':'<3','shard':'#EACH', nodeset : { 'sysprop.rack':'#EACH'}}" +
"{'replica':'<3','shard':'#EACH', nodeset : { 'sysprop.rack':[rack1, rack2, rack3, rack4]}}" +
"]" +
"}" +
"}";

2
solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
View File

@ -87,7 +87,7 @@ public class TestPolicy2 extends SolrTestCaseJ4 {
" 'cluster-preferences':[{ minimize : cores},{maximize : freedisk, precision : 50}]}";
if(useNodeset){
autoScalingjson = "{cluster-policy:[" +
" { replica : '<3' , shard : '#EACH', nodeset:{sysprop.zone: '#EACH'} } ]," +
" { replica : '<3' , shard : '#EACH', nodeset:{sysprop.zone: [east , west]} } ]," +
" 'cluster-preferences':[{ minimize : cores},{maximize : freedisk, precision : 50}]}";
}
policy = new Policy((Map<String, Object>) Utils.fromJSONString(autoScalingjson));