You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/04/06 12:30:34 UTC
[1/2] ambari git commit: AMBARI-10360. HS2 fails to start when
databases exist with LOCATION's outside of hive.metastore.warehouse.dirs
(dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk a49d5a791 -> d09dd4ecc
AMBARI-10360. HS2 fails to start when databases exist with LOCATION's outside of hive.metastore.warehouse.dirs (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97f18c04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97f18c04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97f18c04
Branch: refs/heads/trunk
Commit: 97f18c046ea6a31491f9b3446560523192ce7b03
Parents: a49d5a7
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Apr 6 13:29:12 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Apr 6 13:29:12 2015 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/hive_service.py | 12 +++++++-----
.../test/python/stacks/2.0.6/HIVE/test_hive_server.py | 4 ----
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/97f18c04/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
index 8c4093f..bbd9dee 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
@@ -128,13 +128,15 @@ def hive_service(name, action='start', rolling_restart=False):
def check_fs_root():
import params
- fs_root_url = format("{fs_root}{hive_apps_whs_dir}")
metatool_cmd = format("hive --config {hive_server_conf_dir} --service metatool")
- cmd = as_user(format("{metatool_cmd} -listFSRoot 2>/dev/null", env={'PATH' : params.execute_path }), params.hive_user) + " | grep hdfs:// | grep -v '.db$'"
+ cmd = as_user(format("{metatool_cmd} -listFSRoot 2>/dev/null", env={'PATH': params.execute_path}), params.hive_user) \
+ + format(" | grep hdfs:// | cut -f1,2,3 -d '/' | grep -v '{fs_root}' | head -1")
code, out = shell.call(cmd)
- if code == 0 and fs_root_url.strip() != out.strip():
- cmd = format("{metatool_cmd} -updateLocation {fs_root}{hive_apps_whs_dir} {out}")
+
+ if code == 0 and out.strip() != "" and params.fs_root.strip() != out.strip():
+ out = out.strip()
+ cmd = format("{metatool_cmd} -updateLocation {fs_root} {out}")
Execute(cmd,
user=params.hive_user,
- environment= {'PATH' : params.execute_path }
+ environment={'PATH': params.execute_path}
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/97f18c04/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 24150a8..ddfff2f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -57,10 +57,6 @@ class TestHiveServer(RMFTestCase):
)
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'hive --config /etc/hive/conf.server --service metatool -updateLocation hdfs://c6401.ambari.apache.org:8020/apps/hive/warehouse ',
- environment = {'PATH' : "/bin:/usr/lib/hive/bin:/usr/bin"},
- user = 'hive',
- )
self.assertResourceCalled('Execute', '/tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive',
not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',
environment = {'HADOOP_HOME' : '/usr', 'JAVA_HOME':'/usr/jdk64/jdk1.7.0_45'},
[2/2] ambari git commit: AMBARI-10350. Ambari UI for HBase config
incorrectly describes the -Xmn config (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-10350. Ambari UI for HBase config incorrectly describes the -Xmn config (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d09dd4ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d09dd4ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d09dd4ec
Branch: refs/heads/trunk
Commit: d09dd4ecc5044daee80a06c761cd0808e78ed52b
Parents: 97f18c0
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Apr 6 13:29:58 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Apr 6 13:29:58 2015 +0300
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml | 6 +-----
.../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 8 ++++++--
.../BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml | 8 ++++++--
.../HDP/2.2/services/HBASE/configuration/hbase-env.xml | 8 ++++++--
.../PHD/3.0.0.0/services/HBASE/configuration/hbase-env.xml | 8 ++++++--
.../stacks/HDP/1.3.0/services/HBASE/configuration/global.xml | 8 ++++++--
.../stacks/HDP/2.0.5/services/HBASE/configuration/global.xml | 8 ++++++--
.../stacks/HDP/2.0.7/services/HBASE/configuration/global.xml | 8 ++++++--
8 files changed, 43 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index 307cb15..1734ac4 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -59,11 +59,7 @@
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>
- HBase RegionServer minimum heap size is calculated as a percentage
- of max heap size. If hbase_regionserver_xmn_max is defined, the ratio
- will be used to calculate -Xmn setting.
- </description>
+ <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
</property>
<property>
<name>hbase_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index 7ed92ed..9399b8e 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -47,12 +47,16 @@
<property>
<name>hbase_regionserver_xmn_max</name>
<value>512</value>
- <description>HBase RegionServer maximum value for minimum heap size.</description>
+ <description>
+Sets the upper bound on HBase RegionServers' young generation size.
+This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
+and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
+ </description>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description>
+ <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
</property>
<property>
<name>hbase_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
index 7218deb..fe2799c 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
@@ -39,12 +39,16 @@
<property>
<name>hbase_regionserver_xmn_max</name>
<value>512</value>
- <description>HBase RegionServer maximum value for minimum heap size.</description>
+ <description>
+Sets the upper bound on HBase RegionServers' young generation size.
+This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
+and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
+ </description>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description>
+ <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
</property>
<property>
<name>hbase_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
index a1725e4..5390998 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
@@ -39,12 +39,16 @@
<property>
<name>hbase_regionserver_xmn_max</name>
<value>512</value>
- <description>HBase RegionServer maximum value for minimum heap size.</description>
+ <description>
+Sets the upper bound on HBase RegionServers' young generation size.
+This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
+and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
+ </description>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description>
+ <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
</property>
<property>
<name>hbase_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HBASE/configuration/hbase-env.xml
index 2e92f56..f3bbc57 100644
--- a/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HBASE/configuration/hbase-env.xml
@@ -39,12 +39,16 @@
<property>
<name>hbase_regionserver_xmn_max</name>
<value>512</value>
- <description>HBase RegionServer maximum value for minimum heap size.</description>
+ <description>
+Sets the upper bound on HBase RegionServers' young generation size.
+This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
+and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
+ </description>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description>
+ <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
</property>
<property>
<name>hbase_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
index aff79f2..749fe18 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
@@ -54,12 +54,16 @@
<property>
<name>hbase_regionserver_xmn_max</name>
<value>512</value>
- <description>HBase RegionServer maximum value for minimum heap size.</description>
+ <description>
+Sets the upper bound on HBase RegionServers' young generation size.
+This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
+and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
+ </description>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description>
+ <description>Percentage of max heap size which used for young generation heap (-Xmx).</description>
</property>
<property>
<name>hbase_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
index cc4baf4..c0d1fa9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
@@ -54,12 +54,16 @@
<property>
<name>hbase_regionserver_xmn_max</name>
<value>512</value>
- <description>HBase RegionServer maximum value for minimum heap size.</description>
+ <description>
+Sets the upper bound on HBase RegionServers' young generation size.
+This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
+and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
+ </description>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description>
+ <description>Percentage of max heap size which used for young generation heap (-Xmx).</description>
</property>
<property>
<name>hbase_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d09dd4ec/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
index 3a54dcb..4a79b17 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
@@ -54,12 +54,16 @@
<property>
<name>hbase_regionserver_xmn_max</name>
<value>512</value>
- <description>HBase RegionServer maximum value for minimum heap size.</description>
+ <description>
+Sets the upper bound on HBase RegionServers' young generation size.
+This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
+and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
+ </description>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
- <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description>
+ <description>Percentage of max heap size which used for young generation heap (-Xmx).</description>
</property>
<property>
<name>hbase_master_heapsize</name>