You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/05/27 23:17:18 UTC
ambari git commit: AMBARI-11410: [WinTP2] Fix issues with HDPWIN 2.3
stack deployment (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 82b86622e -> 8deabc2cb
AMBARI-11410: [WinTP2] Fix issues with HDPWIN 2.3 stack deployment (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8deabc2c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8deabc2c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8deabc2c
Branch: refs/heads/trunk
Commit: 8deabc2cb0a0dbd9f64908d77a9cc99098a0c2a7
Parents: 82b8662
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Wed May 27 14:17:12 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Wed May 27 14:17:12 2015 -0700
----------------------------------------------------------------------
.../0.1.0/package/scripts/params_windows.py | 4 +--
.../0.1.0/package/scripts/service_mapping.py | 22 ++++++++++++
.../0.1.0/package/scripts/status.py | 6 ++--
.../0.4.0.2.1/package/scripts/service_check.py | 1 +
.../services/HBASE/configuration/hbase-env.xml | 29 ++++++++++++++++
.../services/HBASE/configuration/hbase-site.xml | 16 +++++++++
.../YARN/configuration/capacity-scheduler.xml | 35 ++++++++++++++++++++
pom.xml | 2 ++
8 files changed, 109 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_windows.py
index cd3ed58..acb5bba 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_windows.py
@@ -50,6 +50,4 @@ hadoop_native_lib = os.path.join(os.environ["HADOOP_HOME"], "bin")
hadoop_bin_dir = os.path.join(os.environ["HADOOP_HOME"], "bin")
hadoop_conf_dir = os.path.join(os.environ["HADOOP_HOME"], "conf")
-ams_collector_win_service_name = "AmbariMetricsCollector"
-ams_monitor_win_service_name = "AmbariMetricsHostMonitoring"
-ams_embedded_hbase_win_service_name = "ams_hbase_master"
+from service_mapping import *
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_mapping.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_mapping.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_mapping.py
new file mode 100644
index 0000000..2eeb427
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_mapping.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+ams_collector_win_service_name = "AmbariMetricsCollector"
+ams_monitor_win_service_name = "AmbariMetricsHostMonitoring"
+ams_embedded_hbase_win_service_name = "ams_hbase_master"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
index c69ce5c..1e9173d 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
@@ -35,8 +35,8 @@ def check_service_status(name):
@OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
def check_service_status(name):
- import params
+ import service_mapping
if name=='collector':
- check_windows_service_status(params.ams_collector_win_service_name)
+ check_windows_service_status(service_mapping.ams_collector_win_service_name)
elif name == 'monitor':
- check_windows_service_status(params.ams_monitor_win_service_name)
+ check_windows_service_status(service_mapping.ams_monitor_win_service_name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/service_check.py
index dcfcd33..9bd366b 100644
--- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/service_check.py
@@ -18,6 +18,7 @@ limitations under the License.
Ambari Agent
"""
+import os
from resource_management.libraries.script import Script
from resource_management.libraries.resources.hdfs_resource import HdfsResource
from resource_management.libraries.resources.execute_hadoop import ExecuteHadoop
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
new file mode 100644
index 0000000..e46932a
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <property>
+ <name>hbase_max_direct_memory_size</name>
+ <value></value>
+ <description>If not empty, adds '-XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m' to HBASE_REGIONSERVER_OPTS.</description>
+ </property>
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
index dd1434a..bd09fd5 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
@@ -62,6 +62,22 @@
</description>
</property>
<property>
+ <name>hbase.bucketcache.ioengine</name>
+ <value></value>
+ <description>Where to store the contents of the bucketcache. One of: onheap,
+ offheap, or file. If a file, set it to file:PATH_TO_FILE.</description>
+ </property>
+ <property>
+ <name>hbase.bucketcache.size</name>
+ <value></value>
+ <description>The size of the buckets for the bucketcache if you only use a single size.</description>
+ </property>
+ <property>
+ <name>hbase.bucketcache.percentage.in.combinedcache</name>
+ <value></value>
+ <description>Value to be set between 0.0 and 1.0</description>
+ </property>
+ <property>
<name>hbase.regionserver.global.memstore.size</name>
<value>0.4</value>
<description>Maximum size of all memstores in a region server before new
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
new file mode 100644
index 0000000..fd9980c
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
@@ -0,0 +1,35 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration supports_final="false">
+
+ <property>
+ <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
+ <deleted>true</deleted>
+ </property>
+
+ <property>
+ <name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
+ <deleted>true</deleted>
+ </property>
+
+ <property>
+ <name>yarn.scheduler.capacity.root.default-node-label-expression</name>
+ <deleted>true</deleted>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8deabc2c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 62cf8eb..b0f75c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,6 +339,8 @@
<exclude>contrib/views/*/.classpath</exclude>
<exclude>contrib/views/*/.project</exclude>
<exclude>contrib/views/*/.settings/**</exclude>
+ <exclude>contrib/views/capacity-scheduler/src/main/resources/ui/app/**</exclude>
+ <exclude>contrib/views/capacity-scheduler/src/main/resources/ui/runner.js</exclude>
<exclude>contrib/ambari-scom/ambari-scom-server/pass.txt</exclude>
<exclude>contrib/ambari-scom/ambari-scom-server/target/**</exclude>