Repository: ambari Updated Branches: refs/heads/branch-windows-dev 94447d7ac -> f96e1d0dd
AMBARI-7939. Customize Services doesn't pick up default configs from HDPWIN stack definition. (Florian Barca via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f96e1d0d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f96e1d0d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f96e1d0d Branch: refs/heads/branch-windows-dev Commit: f96e1d0dd8b8214988c307344fa55240ba1cfe9c Parents: 94447d7 Author: Yusaku Sako <[email protected]> Authored: Wed Oct 29 12:36:02 2014 -0700 Committer: Yusaku Sako <[email protected]> Committed: Wed Oct 29 12:36:30 2014 -0700 ---------------------------------------------------------------------- .../services/HBASE/configuration/hbase-env.xml | 95 +++++++++++++++++++- .../services/HDFS/configuration/hadoop-env.xml | 6 ++ .../services/YARN/configuration/yarn-site.xml | 27 ++++++ ambari-web/app/utils/config.js | 3 +- 4 files changed, 129 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f96e1d0d/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml index 81ddd04..5638505 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml @@ -22,6 +22,21 @@ <configuration> <property> + <name>hbase_log_dir</name> + <value>/var/log/hbase</value> + <description>Log Directories for HBase.</description> + </property> + <property> + <name>hbase_pid_dir</name> + <value>/var/run/hbase</value> + <description>Pid Directory for HBase.</description> + </property> + <property> + <name>hbase_regionserver_heapsize</name> + <value>1024</value> + <description>HBase RegionServer Heap Size.</description> + </property> + <property> <name>hbase_regionserver_xmn_max</name> <value>512</value> <description>HBase RegionServer maximum value for minimum heap size.</description> @@ -31,4 +46,82 @@ <value>0.2</value> <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description> </property> -</configuration> + <property> + <name>hbase_master_heapsize</name> + <value>1024</value> + <description>HBase Master Heap Size</description> + </property> + <property> + <name>hbase_user</name> + <value>hbase</value> + <property-type>USER</property-type> + <description>HBase User Name.</description> + </property> + + <!-- hbase-env.cmd --> + <property> + <name>content</name> + <description>This is the jinja template for hbase-env.cmd file</description> + <value> +@rem Set environment variables here. + +@rem The java implementation to use. Java 1.6 required. +set JAVA_HOME=%JAVA_HOME% + +@rem Extra Java CLASSPATH elements. Optional. +if defined HADOOP_CONF_DIR ( + set HBASE_CLASSPATH=%HBASE_CLASSPATH%;%HADOOP_CONF_DIR% +) else if defined HADOOP_HOME ( + set HBASE_CLASSPATH=%HBASE_CLASSPATH%;%HADOOP_HOME%\conf;%HADOOP_HOME%\etc\hadoop +) + +@rem The maximum amount of heap to use, in MB. Default is 1000. +@rem set HBASE_HEAPSIZE=1000 + +@rem Extra Java runtime options. +@rem Below are what we set by default. May only work with SUN JVM. +@rem For more on why as well as other possible settings, +@rem see http://wiki.apache.org/hadoop/PerformanceTuning +@rem JDK6 on Windows has a known bug for IPv6, use preferIPv4Stack unless JDK7. +@rem See TestIPv6NIOServerSocketChannel. +set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-XX:CMSInitiatingOccupancyFraction=70" "-Djava.net.preferIPv4Stack=true" "-XX:+ForceTimeHighResolution" + +@rem Uncomment below to enable java garbage collection logging for the server-side processes +@rem this enables basic gc logging for the server processes to the .out file +set SERVER_GC_OPTS="-verbose:gc" "-XX:+PrintGCDetails" "-XX:+PrintGCDateStamps" %HBASE_GC_OPTS% + +@rem this enables gc logging using automatic GC log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+. Either use this set of options or the one above +@rem set SERVER_GC_OPTS="-verbose:gc" "-XX:+PrintGCDetails" "-XX:+PrintGCDateStamps" "-XX:+UseGCLogFileRotation" "-XX:NumberOfGCLogFiles=1" "-XX:GCLogFileSize=512M" %HBASE_GC_OPTS% + +@rem Uncomment below to enable java garbage collection logging for the client processes in the .out file. +@rem set CLIENT_GC_OPTS="-verbose:gc" "-XX:+PrintGCDetails" "-XX:+PrintGCDateStamps" %HBASE_GC_OPTS% + +@rem Uncomment below (along with above GC logging) to put GC information in its own logfile (will set HBASE_GC_OPTS) +set HBASE_USE_GC_LOGFILE=true + +@rem Uncomment and adjust to enable JMX exporting +@rem See jmxremote.password and jmxremote.access in %JRE_HOME%\lib\management to configure remote password access. +@rem More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html +@rem +@rem set HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false" "-Dcom.sun.management.jmxremote.authenticate=false" +@rem set HBASE_MASTER_OPTS=%HBASE_JMX_BASE% "-Dcom.sun.management.jmxremote.port=10101" +@rem set HBASE_REGIONSERVER_OPTS=%HBASE_JMX_BASE% "-Dcom.sun.management.jmxremote.port=10102" +@rem set HBASE_THRIFT_OPTS=%HBASE_JMX_BASE% "-Dcom.sun.management.jmxremote.port=10103" +@rem set HBASE_ZOOKEEPER_OPTS=%HBASE_JMX_BASE% "-Dcom.sun.management.jmxremote.port=10104" + +@rem File naming hosts on which HRegionServers will run. %HBASE_HOME%\conf\regionservers by default. +@rem set HBASE_REGIONSERVERS=%HBASE_HOME%\conf\regionservers + +@rem Where log files are stored. $HBASE_HOME/logs by default. +@rem set HBASE_LOG_DIR=%HBASE_HOME%\logs + +@rem A string representing this instance of hbase. $USER by default. +@rem set HBASE_IDENT_STRING=%USERNAME% + +@rem Seconds to sleep between slave commands. Unset by default. This +@rem can be useful in large clusters, where, e.g., slave rsyncs can +@rem otherwise arrive faster than the master can service them. +@rem set HBASE_SLAVE_SLEEP=0.1 + +@rem Tell HBase whether it should manage it's own instance of Zookeeper or not. +@rem set HBASE_MANAGES_ZK=true http://git-wip-us.apache.org/repos/asf/ambari/blob/f96e1d0d/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml index 484235d..85ca907 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml @@ -32,4 +32,10 @@ <description>File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.</description> </property> + <property> + <name>dfs.datanode.data.dir.mount.file</name> + <value>file:///c:/hadoop/conf/dfs_data_dir_mount.hist</value> + <description>File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.</description> + </property> + </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/f96e1d0d/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml index 7aecf01..b22bb5a 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml @@ -40,6 +40,13 @@ <property> <name>yarn.nodemanager.address</name> <value>0.0.0.0:45454</value> + <description>The address of the container manager in the NM.</description> + </property> + <property> + <name>yarn.nodemanager.resource.memory-mb</name> + <value>5120</value> + <description>Amount of physical memory, in MB, that can be allocated + for containers.</description> </property> <property> <name>yarn.nodemanager.webapp.address</name> @@ -148,6 +155,26 @@ </property> <property> + <name>yarn.scheduler.minimum-allocation-mb</name> + <value>512</value> + <description> + The minimum allocation for every container request at the RM, + in MBs. Memory requests lower than this won't take effect, + and the specified value will get allocated at minimum. + </description> + </property> + + <property> + <name>yarn.scheduler.maximum-allocation-mb</name> + <value>2048</value> + <description> + The maximum allocation for every container request at the RM, + in MBs. Memory requests higher than this won't take effect, + and will get capped to this value. + </description> + </property> + + <property> <name>yarn.resourcemanager.hostname</name> <value>localhost</value> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/f96e1d0d/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 153390d..5c25ad6 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -883,8 +883,9 @@ App.config = Em.Object.create({ params.callback(properties); }, - loadClusterConfigError: function (request, ajaxOptions, error, opt) { + loadClusterConfigError: function (request, ajaxOptions, error, opt, params) { console.log('ERROR: Failed to load cluster-env configs'); + params.callback([]); },
