lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject lucene-solr:feature/autoscaling: SOLR-10373: Override registerV2() in AutoScalingHandler, Fix api spec name used in AutoScalingHandler and merge problem in api spec
Date Fri, 12 May 2017 08:30:38 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/feature/autoscaling 3aa0da78c -> 17490d30f


SOLR-10373: Override registerV2() in AutoScalingHandler, Fix api spec name used in AutoScalingHandler
and merge problem in api spec


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/17490d30
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/17490d30
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/17490d30

Branch: refs/heads/feature/autoscaling
Commit: 17490d30f3cd70d7dae04e7716742e4b697bdd14
Parents: 3aa0da7
Author: Shalin Shekhar Mangar <shalin@apache.org>
Authored: Fri May 12 14:00:27 2017 +0530
Committer: Shalin Shekhar Mangar <shalin@apache.org>
Committed: Fri May 12 14:00:27 2017 +0530

----------------------------------------------------------------------
 .../cloud/autoscaling/AutoScalingHandler.java   |  7 ++++-
 .../resources/apispec/autoscaling.Commands.json | 31 +++-----------------
 2 files changed, 10 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17490d30/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
index 5173251..759ca14 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
@@ -552,6 +552,11 @@ public class AutoScalingHandler extends RequestHandlerBase implements
Permission
 
   @Override
   public Collection<Api> getApis() {
-    return ApiBag.wrapRequestHandlers(this, "scaling.Commands");
+    return ApiBag.wrapRequestHandlers(this, "autoscaling.Commands");
+  }
+
+  @Override
+  public Boolean registerV2() {
+    return Boolean.TRUE;
   }
 }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17490d30/solr/core/src/resources/apispec/autoscaling.Commands.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/autoscaling.Commands.json b/solr/core/src/resources/apispec/autoscaling.Commands.json
index 7d6633c..77b42cd 100644
--- a/solr/core/src/resources/apispec/autoscaling.Commands.json
+++ b/solr/core/src/resources/apispec/autoscaling.Commands.json
@@ -42,34 +42,11 @@
         "actions": {
           "type": "array",
           "description": "The actions to be performed in sequence when the trigger is activated",
-          "event": {
-            "type": "string",
-            "description": "The event type on which to set a trigger"
-          },
-          "waitFor": {
-            "type": "string",
-            "description": "The amount of time to wait after the trigger condition is satisfied
before trigger is activated"
-          },
-          "lowerBound": {
-            "type": "number",
-            "description": "The lower bound of the condition below which the trigger is activated"
-          },
-          "upperBound": {
-            "type": "number",
-            "description": "The upper bound of the condition below which the trigger is activated"
-          },
-          "enabled": {
-            "type": "boolean",
-            "description": "The state of the trigger"
-          },
-          "actions": {
-            "type": "array",
-            "description": "The actions to be performed in sequence when the trigger is activated",
-            "items": {
-              "type": "object"
-            }
+          "items": {
+            "type": "object"
           }
-        },
+        }
+      },
         "required": [
           "name",
           "event"


Mime
View raw message