ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-18069. hadoop2 metrics is not configured for HSI - resulting in memory leak (smohanty)
Date Mon, 08 Aug 2016 22:44:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 364411266 -> 81797a69f


AMBARI-18069. hadoop2 metrics is not configured for HSI - resulting in memory leak (smohanty)


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

Branch: refs/heads/trunk
Commit: 81797a69ffef80ba10a2aedbb494935c172eba1d
Parents: 3644112
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Mon Aug 8 15:31:53 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Mon Aug 8 15:32:00 2016 -0700

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/hive_interactive.py        | 6 ++++++
 .../HIVE/configuration/hiveserver2-interactive-site.xml        | 2 +-
 .../src/test/python/stacks/2.5/HIVE/test_hive_server_int.py    | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/81797a69/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
index f09a9f2..1bcb954 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
@@ -223,6 +223,12 @@ def hive_interactive(name=None):
          owner=params.hive_user,
          content=params.beeline_log4j2)
 
+      File(os.path.join(hive_server_interactive_conf_dir, "hadoop-metrics2-hiveserver2.properties"),
+           owner=params.hive_user,
+           group=params.user_group,
+           content=Template("hadoop-metrics2-hiveserver2.properties.j2")
+           )
+
       File(format("{hive_server_interactive_conf_dir}/hadoop-metrics2-llapdaemon.properties"),
            owner=params.hive_user,
            group=params.user_group,

http://git-wip-us.apache.org/repos/asf/ambari/blob/81797a69/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
index 1fc75a3..89bf43c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
@@ -32,7 +32,7 @@ limitations under the License.
   </property>
   <property>
     <name>hive.service.metrics.hadoop2.component</name>
-    <value>hiveserver2-interactive</value>
+    <value>hiveserver2</value>
     <on-ambari-upgrade add="true"/>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/81797a69/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
index c3c977f..389e45d 100644
--- a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
+++ b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
@@ -372,6 +372,12 @@ class TestHiveServerInteractive(RMFTestCase):
                                   group='hadoop',
                                   mode=0644,
         )
+        self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-hiveserver2.properties'),
+                                  content=Template("hadoop-metrics2-hiveserver2.properties.j2"),
+                                  owner='hive',
+                                  group='hadoop'
+                                  )
+
         self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-llapdaemon.properties'),
                                   content=Template("hadoop-metrics2-llapdaemon.j2"),
                                   owner='hive',


Mime
View raw message