You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/10/26 09:53:49 UTC
[1/2] lucene-solr:branch_7x: SOLR-9735: Fix autoscaling.Commands.json
structure
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 914c42ab0 -> 0dbfcdbd7
SOLR-9735: Fix autoscaling.Commands.json structure
(cherry picked from commit b5d3d24)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7a3491dc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a3491dc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a3491dc
Branch: refs/heads/branch_7x
Commit: 7a3491dc9360b6c6a0d172e3c15598501330a2f9
Parents: 914c42a
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Oct 26 15:14:11 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Oct 26 15:23:16 2017 +0530
----------------------------------------------------------------------
.../resources/apispec/autoscaling.Commands.json | 43 ++++++++++----------
1 file changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a3491dc/solr/solrj/src/resources/apispec/autoscaling.Commands.json
----------------------------------------------------------------------
diff --git a/solr/solrj/src/resources/apispec/autoscaling.Commands.json b/solr/solrj/src/resources/apispec/autoscaling.Commands.json
index 95563ed..31820ce 100644
--- a/solr/solrj/src/resources/apispec/autoscaling.Commands.json
+++ b/solr/solrj/src/resources/apispec/autoscaling.Commands.json
@@ -13,7 +13,7 @@
},
"commands": {
"set-trigger": {
- "type":"object",
+ "type": "object",
"description": "The set-trigger command allows you to add and update triggers on various system metrics",
"properties": {
"name": {
@@ -48,11 +48,10 @@
}
}
},
- "required": [
- "name",
- "event"
- ]
- }
+ "required": [
+ "name",
+ "event"
+ ]
},
"remove-trigger": {
"description": "Remove a trigger",
@@ -87,21 +86,21 @@
"type": "array",
"description": "The stage of the trigger for which to listen",
"items": {
- "type" : "string"
+ "type": "string"
}
},
"beforeAction": {
"type": "array",
"description": "The name of the action before which the listener should be notified",
"items": {
- "type" : "string"
+ "type": "string"
}
},
"afterAction": {
"type": "array",
"description": "The name of the action after which the listener should be notified",
"items": {
- "type" : "string"
+ "type": "string"
}
},
"class": {
@@ -159,23 +158,23 @@
"name"
]
},
- "set-policy" : {
- "type":"object",
+ "set-policy": {
+ "type": "object",
"description": "The set-policy command allows you to add and update policies that apply to collections",
- /* "patternProperties": {
- "^.+$": {
- "type": "array"
- }
- },*/
+ /* "patternProperties": {
+ "^.+$": {
+ "type": "array"
+ }
+ },*/
"additionalProperties": true
},
- "set-cluster-policy" : {
- "type" : "array",
- "description" : "The set-cluster-policy command allows you to add and update cluster-level policy that acts as the base for all collection level policies, if any"
+ "set-cluster-policy": {
+ "type": "array",
+ "description": "The set-cluster-policy command allows you to add and update cluster-level policy that acts as the base for all collection level policies, if any"
},
- "set-cluster-preferences" : {
- "type" : "array",
- "description" : "The set-cluster-preferences command allows you to add and update cluster-level preferences that are used to sort nodes for selection in cluster operations"
+ "set-cluster-preferences": {
+ "type": "array",
+ "description": "The set-cluster-preferences command allows you to add and update cluster-level preferences that are used to sort nodes for selection in cluster operations"
},
"remove-policy": {
"description": "Remove a policy",
[2/2] lucene-solr:branch_7x: SOLR-9735: Enable randomized testing
between v1 and v2 APIs
Posted by sh...@apache.org.
SOLR-9735: Enable randomized testing between v1 and v2 APIs
(cherry picked from commit 0fad80b)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0dbfcdbd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0dbfcdbd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0dbfcdbd
Branch: refs/heads/branch_7x
Commit: 0dbfcdbd7c1231779a42258838384ef65db2fda1
Parents: 7a3491d
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Oct 26 15:19:32 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Oct 26 15:23:32 2017 +0530
----------------------------------------------------------------------
.../org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0dbfcdbd/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
index 335fdbc..942f882 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
@@ -784,7 +784,7 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase {
}
static SolrRequest createAutoScalingRequest(SolrRequest.METHOD m, String subPath, String message) {
- boolean useV1 = false;
+ boolean useV1 = random().nextBoolean();
String path = useV1 ? "/admin/autoscaling" : "/cluster/autoscaling";
path += subPath != null ? subPath : "";
return useV1