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/09/18 16:16:30 UTC

[6/6] lucene-solr:feature/autoscaling_72: Merge branch 'feature/autoscaling' into feature/autoscaling_72

Merge branch 'feature/autoscaling' into feature/autoscaling_72


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

Branch: refs/heads/feature/autoscaling_72
Commit: 48c1f16390c524f14baec4e5580e130687e4a8cb
Parents: a67e903 6fb2803
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Sep 18 09:16:00 2017 -0700
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Sep 18 09:16:00 2017 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt                                |   2 +
 .../solr/cloud/autoscaling/AutoScaling.java     |   2 +
 .../cloud/autoscaling/ComputePlanAction.java    |  50 ++++
 .../cloud/autoscaling/NodeAddedTrigger.java     | 111 +------
 .../solr/cloud/autoscaling/NodeLostTrigger.java | 101 +------
 .../cloud/autoscaling/SearchRateTrigger.java    | 290 +++++++++++++++++++
 .../solr/cloud/autoscaling/TriggerBase.java     | 127 +++++++-
 .../solr/handler/admin/CollectionsHandler.java  |  14 +-
 .../solr/handler/admin/MetricsHandler.java      |  11 +-
 .../autoscaling/ComputePlanActionTest.java      |  53 ++++
 .../autoscaling/SearchRateTriggerTest.java      | 167 +++++++++++
 .../solr/handler/admin/MetricsHandlerTest.java  |   9 +
 solr/solr-ref-guide/src/collections-api.adoc    |   3 +
 .../cloud/autoscaling/AddReplicaSuggester.java  |  15 +-
 .../cloud/autoscaling/ClusterDataProvider.java  |   4 +
 .../solrj/cloud/autoscaling/NoneSuggester.java  |   4 +-
 .../client/solrj/cloud/autoscaling/Policy.java  |  75 +++--
 .../solrj/cloud/autoscaling/PolicyHelper.java   |  10 +-
 .../solrj/cloud/autoscaling/ReplicaInfo.java    |  24 ++
 .../solrj/impl/SolrClientDataProvider.java      |  24 +-
 .../solr/common/params/AutoScalingParams.java   |   7 +
 .../resources/apispec/collections.Commands.json |   5 +
 .../collections.collection.Commands.modify.json |   5 +
 .../solrj/cloud/autoscaling/TestPolicy.java     | 107 ++++---
 24 files changed, 925 insertions(+), 295 deletions(-)
----------------------------------------------------------------------