AMBARI-21975. Stack Advisor can reset the number of shards (Log Search) during adding a new service (BP install) (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d829312a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d829312a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d829312a Branch: refs/heads/branch-2.6 Commit: d829312a08eb3696b0c72aa190533c09ad1a6cac Parents: 78afc58 Author: Oliver Szabo <oleew...@gmail.com> Authored: Sun Sep 17 15:01:21 2017 +0200 Committer: Oliver Szabo <oleew...@gmail.com> Committed: Mon Sep 18 12:19:09 2017 +0200 ---------------------------------------------------------------------- .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py | 2 +- .../src/test/python/stacks/2.3/common/test_stack_advisor.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d829312a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py index f0d9f78..0b0c9c5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py @@ -1036,7 +1036,7 @@ class HDP22StackAdvisor(HDP21StackAdvisor): recommendedMinShards = len(infraSolrHosts) recommendedShards = 2 * len(infraSolrHosts) - recommendedMaxShards = 3 * len(infraSolrHosts) + recommendedMaxShards = max(3 * len(infraSolrHosts), 5) else: recommendedReplicationFactor = 2 http://git-wip-us.apache.org/repos/asf/ambari/blob/d829312a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py index ff57c7b..4f8eaf2 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py @@ -2002,11 +2002,11 @@ class TestHDP23StackAdvisor(TestCase): "property_attributes": { "logsearch.collection.service.logs.numshards": { "minimum": "1", - "maximum": "3" + "maximum": "5" }, "logsearch.collection.audit.logs.numshards": { "minimum": "1", - "maximum": "3" + "maximum": "5" } } }