AMBARI-17408. Use the correct config for slider AM size 'slider_am_container_mb' to set its value during LLAP config calculations.

ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py

@@ -450,7 +450,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
   Entry point for updating Hive's 'LLAP app' configs namely : (1). num_llap_nodes, num_llap_nodes_copy
     (2). hive.llap.daemon.yarn.container.mb, hive.llap.daemon.yarn.container.mb_copy (3). hive.llap.daemon.num.executors,
     hive.llap.daemon.num.executors_copy (4). hive.llap.io.memory.size, hive.llap.io.memory.size_copy (5). llap_heap_size
-    (6). slider_am_container_size, and (7). hive.server2.tez.sessions.per.default.queue
+    (6). slider_am_container_mb, and (7). hive.server2.tez.sessions.per.default.queue
 
     The trigger point for updating LLAP configs (mentioned above) is change in values of any of the following:
     (1). 'enable_hive_interactive' set to 'true' (2). 'llap_queue_capacity' (3). 'hive.server2.tez.sessions.per.default.queue'
@@ -725,8 +725,8 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
         Logger.info("LLAP config 'llap_heap_size' updated. Current: {0}".format(llap_xmx))
 
         slider_am_container_size = long(slider_am_container_size)
-        putHiveInteractiveEnvProperty('slider_am_container_size', slider_am_container_size)
-        Logger.info("LLAP config 'slider_am_container_size' updated. Current: {0}".format(slider_am_container_size))
+        putHiveInteractiveEnvProperty('slider_am_container_mb', slider_am_container_size)
+        Logger.info("LLAP config 'slider_am_container_mb' updated. Current: {0}".format(slider_am_container_size))
 
     except Exception as e:
       # Set default values, if caught an Exception. The 'llap queue capacity' is left untouched, as it can be increased,
@@ -771,7 +771,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 
         putHiveInteractiveEnvProperty('llap_heap_size', 0)
 
-        putHiveInteractiveEnvProperty('slider_am_container_size', slider_am_container_size)
+        putHiveInteractiveEnvProperty('slider_am_container_mb', slider_am_container_size)
 
       except Exception as e:
         Logger.info("Problem setting minimum values for LLAP configs in Exception code.")

ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py

@@ -3537,7 +3537,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '409')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '512')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '512')
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'], 'llap')
 
     self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'], '512')
@@ -3736,7 +3736,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '272')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '341')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '341')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'visible': 'false'})
 
@@ -3938,7 +3938,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '819')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '1024')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '1024')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'], 'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
@@ -4143,7 +4143,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '3276')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '2048')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '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'],
@@ -4343,7 +4343,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '341')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '341')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'], 'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
@@ -4540,7 +4540,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '2048')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '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'],
@@ -4745,7 +4745,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '3276')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '3072')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '3072')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'], 'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
@@ -4945,7 +4945,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '2728')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '341')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '341')
 
     self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'], 'llap')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
@@ -5140,7 +5140,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '2048')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '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'],
@@ -5327,7 +5327,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '2048')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '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'],
@@ -5516,7 +5516,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '2048')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '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'],
@@ -5736,7 +5736,7 @@ class TestHDP25StackAdvisor(TestCase):
 
     self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '2457')
 
-    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_size'], '2048')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '2048')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'visible': 'false'})
 
@@ -5955,7 +5955,7 @@ 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'], '1024')
+    self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '1024')
     self.assertEquals(configurations['hive-interactive-env']['property_attributes']['llap_queue_capacity'],
                       {'visible': 'false'})