ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject [1/2] ambari git commit: AMBARI-17389. Read 'yarn.nodemanager.resource.memory-mb' and 'yarn.scheduler.minimum-allocation-mb' from 'configurations' if 'changed-configurations' is empty and configs is there in 'configurations', else from 'services'.
Date Thu, 23 Jun 2016 03:37:05 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 ec942a1ac -> 1f098c1d8


AMBARI-17389. Read 'yarn.nodemanager.resource.memory-mb' and 'yarn.scheduler.minimum-allocation-mb'
from 'configurations' if 'changed-configurations' is empty and configs is there in 'configurations',
else from 'services'.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f2fc3f2f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f2fc3f2f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f2fc3f2f

Branch: refs/heads/branch-2.4
Commit: f2fc3f2fbdb85acd978821065d1493ca9521c896
Parents: ec942a1
Author: Swapan Shridhar <sshridhar@hortonworks.com>
Authored: Wed Jun 22 20:32:40 2016 -0700
Committer: Swapan Shridhar <sshridhar@hortonworks.com>
Committed: Wed Jun 22 20:32:40 2016 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.5/services/stack_advisor.py    |  34 +++--
 .../stacks/2.5/common/test_stack_advisor.py     | 130 +++++++++----------
 2 files changed, 90 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f2fc3f2f/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 8aa2f5f..4c2f889 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -863,7 +863,6 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
       if 'hive.tez.container.size' in services['configurations']['hive-site']['properties']:
         hive_container_size = float(services['configurations']['hive-site']['properties']['hive.tez.container.size'])
         Logger.info("'hive.tez.container.size' read from services as : {0}".format(hive_container_size))
-
     if not hive_container_size:
       raise Fail("Couldn't retrieve Hive Server 'hive.tez.container.size' config.")
 
@@ -873,13 +872,21 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
     return hive_container_size
 
   """
-  Gets YARN's minimum container size (yarn.scheduler.minimum-allocation-mb). Takes into account
if it has been calculated
-  as part of current Stack Advisor invocation.
+  Gets YARN's minimum container size (yarn.scheduler.minimum-allocation-mb).
+  Reads from:
+    - configurations (if changed as part of current Stack Advisor invocation (output)), and
services["changed-configurations"]
+      is empty, else
+    - services['configurations'] (input).
+
+  services["changed-configurations"] would be empty if Stack Advisor call is made from Blueprints
(1st invocation). Subsequent
+  Stack Advisor calls will have it non-empty. We do this because in subsequent invocations,
even if Stack Advsior calculates this
+  value (configurations), it is finally not recommended, making 'input' value to survive.
   """
   def get_yarn_min_container_size(self, services, configurations):
     yarn_min_container_size = None
-    # Check if 'yarn.scheduler.minimum-allocation-mb' is modified in current ST invocation.
-    if 'yarn-site' in configurations and 'yarn.scheduler.minimum-allocation-mb' in configurations['yarn-site']['properties']:
+    # Check if services["changed-configurations"] is empty and 'yarn.scheduler.minimum-allocation-mb'
is modified in current ST invocation.
+    if not services["changed-configurations"] and \
+      'yarn-site' in configurations and 'yarn.scheduler.minimum-allocation-mb' in configurations['yarn-site']['properties']:
       yarn_min_container_size = float(configurations['yarn-site']['properties']['yarn.scheduler.minimum-allocation-mb'])
       Logger.info("'yarn.scheduler.minimum-allocation-mb' read from configurations as : {0}".format(yarn_min_container_size))
 
@@ -909,14 +916,22 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
       return 256
 
   """
-  Gets YARN NodeManager memory in MB (yarn.nodemanager.resource.memory-mb). Takes into account
if it has been calculated
-  as part of current Stack Advisor invocation.
+  Gets YARN NodeManager memory in MB (yarn.nodemanager.resource.memory-mb).
+  Reads from:
+    - configurations (if changed as part of current Stack Advisor invocation (output)), and
services["changed-configurations"]
+      is empty, else
+    - services['configurations'] (input).
+
+  services["changed-configurations"] would be empty is Stack Advisor call if made from Blueprints
(1st invocation). Subsequent
+  Stack Advisor calls will have it non-empty. We do this because in subsequent invocations,
even if Stack Advsior calculates this
+  value (configurations), it is finally not recommended, making 'input' value to survive.
   """
   def get_yarn_nm_mem_in_mb(self, services, configurations):
     yarn_nm_mem_in_mb = None
 
-    # Check if 'yarn.nodemanager.resource.memory-mb' is modified in current ST invocation.
-    if 'yarn-site' in configurations and 'yarn.nodemanager.resource.memory-mb' in configurations['yarn-site']['properties']:
+    # Check if services["changed-configurations"] is empty and 'yarn.nodemanager.resource.memory-mb'
is modified in current ST invocation.
+    if not services["changed-configurations"] and\
+        'yarn-site' in configurations and 'yarn.nodemanager.resource.memory-mb' in configurations['yarn-site']['properties']:
       yarn_nm_mem_in_mb = float(configurations['yarn-site']['properties']['yarn.nodemanager.resource.memory-mb'])
       Logger.info("'yarn.nodemanager.resource.memory-mb' read from configurations as : {0}".format(yarn_nm_mem_in_mb))
 
@@ -925,6 +940,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
       if 'yarn-site' in services['configurations'] and \
           'yarn.nodemanager.resource.memory-mb' in services['configurations']['yarn-site']['properties']:
         yarn_nm_mem_in_mb = float(services['configurations']['yarn-site']['properties']['yarn.nodemanager.resource.memory-mb'])
+        Logger.info("'yarn.nodemanager.resource.memory-mb' read from services as : {0}".format(yarn_nm_mem_in_mb))
 
     if not yarn_nm_mem_in_mb:
       raise Fail("Couldn't retrieve YARN's 'yarn.nodemanager.resource.memory-mb' config.")

http://git-wip-us.apache.org/repos/asf/ambari/blob/f2fc3f2f/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index fce1c1c..0218b30 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -1216,7 +1216,7 @@ class TestHDP25StackAdvisor(TestCase):
     cap_sched_expected_dict = convertToDict(self.expected_capacity_scheduler_llap_queue_size_40['properties']['capacity-scheduler'])
     self.assertEqual(cap_sched_output_dict, cap_sched_expected_dict)
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
-                      {'maximum': '100', 'minimum': '20', 'visible': 'true'})
+                      {'maximum': '100', 'minimum': '100', 'visible': 'true'})
 
 
 
@@ -1371,7 +1371,7 @@ class TestHDP25StackAdvisor(TestCase):
     cap_sched_expected_dict = convertToDict(self.expected_capacity_scheduler_llap_queue_size_40['properties']['capacity-scheduler'])
     self.assertEqual(cap_sched_output_dict, cap_sched_expected_dict)
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
-                      {'maximum': '100', 'minimum': '20', 'visible': 'true'})
+                      {'maximum': '100', 'minimum': '25', 'visible': 'true'})
 
 
   # Test 6: (1). 'llap' (0%) and 'default' (100%) queues exists at leaf level in capacity-scheduler
and 'capacity-scheduler'
@@ -3723,7 +3723,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'1')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'5120')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'5115')
 
     self.assertTrue('hive.llap.daemon.queue.name' not in configurations['hive-interactive-site']['properties'])
     self.assertTrue('hive.server2.tez.default.queues' not in configurations['hive-interactive-site']['properties'])
@@ -3731,21 +3731,21 @@ class TestHDP25StackAdvisor(TestCase):
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'1')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'1')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'4779')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'4774')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'272')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'512')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'341')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'visible': 'false'})
 
-    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'512')
+    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'682')
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'5120')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'5115')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'1')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'4779')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'4774')
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'1')
 
 
@@ -3928,12 +3928,12 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'1')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'9216')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'17408')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'1')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'1')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'8192')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'16384')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'819')
@@ -3947,9 +3947,9 @@ class TestHDP25StackAdvisor(TestCase):
     self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'1024')
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'9216')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'17408')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'1')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'8192')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'16384')
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'1')
 
 
@@ -4328,17 +4328,17 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.stackAdvisor.recommendYARNConfigurations(configurations, clusterData, services,
self.hosts)
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.sessions.per.default.queue'],
'11')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.sessions.per.default.queue'],
'13')
     self.assertEquals(configurations['hive-interactive-site']['property_attributes']['hive.server2.tez.sessions.per.default.queue'],
{'minimum': '1', 'maximum': '32'})
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'2')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'10230')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'12276')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'3')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'3')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'7158')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'9204')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'2457')
@@ -4352,9 +4352,9 @@ class TestHDP25StackAdvisor(TestCase):
     self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'682')
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'10230')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'12276')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'3')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'7158')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'9204')
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'2')
 
 
@@ -4530,12 +4530,12 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'1')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'61440')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'204800')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'3')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'3')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'58368')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'201728')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'2457')
@@ -4550,9 +4550,9 @@ class TestHDP25StackAdvisor(TestCase):
 
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'61440')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'204800')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'3')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'58368')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'201728')
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'1')
 
 
@@ -4930,17 +4930,17 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.stackAdvisor.recommendYARNConfigurations(configurations, clusterData, services,
self.hosts)
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.sessions.per.default.queue'],
'18')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.sessions.per.default.queue'],
'32')
     self.assertEquals(configurations['hive-interactive-site']['property_attributes']['hive.server2.tez.sessions.per.default.queue'],
{'minimum': '1', 'maximum': '32'})
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'3')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'4')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'10230')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'204600')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'10')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'10')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'6820')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'201190')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'2728')
@@ -4951,14 +4951,14 @@ class TestHDP25StackAdvisor(TestCase):
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'maximum': '100', 'minimum': '20', 'visible': 'true'})
 
-    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'682')
+    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'1705')
 
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'10230')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'204600')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'10')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'6820')
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'3')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'201190')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'4')
 
 
 
@@ -5128,31 +5128,31 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.stackAdvisor.recommendYARNConfigurations(configurations, clusterData, services,
self.hosts)
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'1')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'2')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'164480')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'204800')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'3')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'3')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'161408')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'201728')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'82240')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'2048')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'],
'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
-                      {'maximum': '100', 'minimum': '25', 'visible': 'true'})
+                      {'maximum': '100', 'minimum': '20', 'visible': 'true'})
 
-    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'82240')
+    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'2048')
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'164480')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'204800')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'3')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'161408')
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'1')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'201728')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'2')
 
 
 
@@ -5315,31 +5315,31 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.stackAdvisor.recommendYARNConfigurations(configurations, clusterData, services,
self.hosts)
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'1')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'2')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'164480')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'204800')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'3')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'3')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'161408')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'201728')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'164480')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'2048')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'],
'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
-                      {'maximum': '100', 'minimum': '49', 'visible': 'true'})
+                      {'maximum': '100', 'minimum': '20', 'visible': 'true'})
 
-    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'164480')
+    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'2048')
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'164480')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'204800')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'3')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'161408')
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'1')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'201728')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'2')
 
 
 
@@ -5504,32 +5504,32 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.stackAdvisor.recommendYARNConfigurations(configurations, clusterData, services,
self.hosts)
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'1')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'2')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'246720')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'204800')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'3')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'3')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'243648')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'201728')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'82240')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'2048')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'],
'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'maximum': '100', 'minimum': '20', 'visible': 'true'})
 
-    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'82240')
+    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'2048')
 
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'246720')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'204800')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'3')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'243648')
-    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'1')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'201728')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'2')
 
 
 
@@ -5726,26 +5726,26 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'4')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'10240')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'204800')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'3')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'3')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'7168')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
'201728')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
'true')
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'512')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'2048')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'visible': 'false'})
 
-    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'512')
+    self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
'2048')
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'10240')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'204800')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'3')
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'7168')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'201728')
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'4')
 
 
@@ -5945,7 +5945,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
'0')
 
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'512')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
'2048')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
'0')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
'0')
@@ -5955,14 +5955,14 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
'0')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'512')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'],
'1024')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'visible': 'false'})
 
     self.assertTrue('tez.am.resource.memory.mb' not in configurations['tez-interactive-site']['properties'])
 
     # Check '*_copy' configs, used for displaying it as label on UI.
-    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'512')
+    self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'2048')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors_copy'],
'0')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size_copy'],
'0')
     self.assertEqual(configurations['hive-interactive-env']['properties']['num_llap_nodes_copy'],
'0')
@@ -6140,7 +6140,7 @@ class TestHDP25StackAdvisor(TestCase):
                       self.expected_hive_interactive_site_llap['hive-interactive-site']['properties']['hive.llap.daemon.queue.name'])
     self.assertEquals(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'],
'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
-                      {'maximum': '100', 'minimum': '100', 'visible': 'true'})
+                      {'maximum': '100', 'minimum': '20', 'visible': 'true'})
 
     # Check '*_copy' configs, used for displaying it as label on UI.
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb_copy'],
'10240')


Mime
View raw message