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

SOLR-10278: special case of global tags were not taken care of

This commit is contained in:
Noble Paul 2017-05-02 18:26:31 +09:30
parent 83f8ed8634
commit 2818ee91dd
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,9 +96,17 @@ public class Clause implements MapWriter, Comparable<Clause> {
@Override @Override
public int compareTo(Clause that) { public int compareTo(Clause that) {
int v = Integer.compare(this.tag.op.priority, that.tag.op.priority); try {
if (v != 0) return v; int v = Integer.compare(this.tag.op.priority, that.tag.op.priority);
return Integer.compare(this.replica.op.priority, that.replica.op.priority); if (v != 0) return v;
return this.isPerCollectiontag() && that.isPerCollectiontag() ?
Integer.compare(this.replica.op.priority, that.replica.op.priority) :
0;
} catch (NullPointerException e) {
System.out.println("this: " + Utils.toJSONString(this));
System.out.println("thAt: " + Utils.toJSONString(that));
throw e;
}
} }
static class Condition { static class Condition {
@ -164,18 +172,22 @@ public class Clause implements MapWriter, Comparable<Clause> {
TestStatus test(Row row) { TestStatus test(Row row) {
AtomicReference<TestStatus> result = new AtomicReference<>(NOT_APPLICABLE); AtomicReference<TestStatus> result = new AtomicReference<>(NOT_APPLICABLE);
if (isPerCollectiontag()) {
for (Map.Entry<String, Map<String, List<ReplicaInfo>>> colls : row.replicaInfo.entrySet()) { for (Map.Entry<String, Map<String, List<ReplicaInfo>>> colls : row.replicaInfo.entrySet()) {
if (result.get() == FAIL) break; if (result.get() == FAIL) break;
if (!collection.isPass(colls.getKey())) continue; if (!collection.isPass(colls.getKey())) continue;
int count = 0; int count = 0;
for (Map.Entry<String, List<ReplicaInfo>> shards : colls.getValue().entrySet()) { for (Map.Entry<String, List<ReplicaInfo>> shards : colls.getValue().entrySet()) {
if (!shard.isPass(shards.getKey()) || result.get() == FAIL) break; if (!shard.isPass(shards.getKey()) || result.get() == FAIL) break;
count += shards.getValue().size(); count += shards.getValue().size();
if (shard.val.equals(EACH)) testReplicaCount(row, result, count); if (shard.val.equals(EACH)) testReplicaCount(row, result, count);
if (EACH.equals(shard.val)) count = 0; if (EACH.equals(shard.val)) count = 0;
}
if (shard.val.equals(ANY)) testReplicaCount(row, result, count);
} }
if (shard.val.equals(ANY)) testReplicaCount(row, result, count); } else {
if (!tag.isPass(row)) result.set(TestStatus.FAIL);
} }
if (result.get() == FAIL) row.violations.add(this); if (result.get() == FAIL) row.violations.add(this);
return result.get(); return result.get();
@ -183,7 +195,7 @@ public class Clause implements MapWriter, Comparable<Clause> {
} }
private void testReplicaCount(Row row, AtomicReference<TestStatus> result, int count) { private void testReplicaCount(Row row, AtomicReference<TestStatus> result, int count) {
if("node".equals(tag.name)) if(!tag.isPass(row.node)) return; if ("node".equals(tag.name)) if (!tag.isPass(row.node)) return;
boolean checkCount = replica.op.match(replica.val, 0) != PASS || count > 0; boolean checkCount = replica.op.match(replica.val, 0) != PASS || count > 0;
if (replica.op == WILDCARD && count > 0 && !tag.isPass(row)) {//nodeRole:'!overseer', strict:false if (replica.op == WILDCARD && count > 0 && !tag.isPass(row)) {//nodeRole:'!overseer', strict:false
result.set(FAIL); result.set(FAIL);