You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/07/11 15:25:45 UTC
[10/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
AMBARI-21431. Update BigInsight configuration files to be compliant with XSD
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d6fcfa1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d6fcfa1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d6fcfa1
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: 1d6fcfa199a2eb9530452dc01d2a5af68e0a131b
Parents: 8e1af7a
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Mon Jul 10 08:37:42 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Jul 11 17:13:50 2017 +0200
----------------------------------------------------------------------
.../ambari/server/stack/StackManager.java | 14 +-
.../4.0/configuration/cluster-env.xml | 21 +++
.../AMBARI_METRICS/configuration/ams-env.xml | 7 +
.../configuration/ams-hbase-env.xml | 11 ++
.../configuration/ams-hbase-log4j.xml | 1 +
.../configuration/ams-hbase-policy.xml | 3 +
.../configuration/ams-hbase-security-site.xml | 18 ++
.../configuration/ams-hbase-site.xml | 47 ++++++
.../AMBARI_METRICS/configuration/ams-log4j.xml | 1 +
.../AMBARI_METRICS/configuration/ams-site.xml | 51 ++++++
.../services/FLUME/configuration/flume-conf.xml | 1 +
.../services/FLUME/configuration/flume-env.xml | 4 +
.../services/HBASE/configuration/hbase-env.xml | 8 +
.../configuration/hbase-javaopts-properties.xml | 1 +
.../HBASE/configuration/hbase-log4j.xml | 1 +
.../HBASE/configuration/hbase-policy.xml | 3 +
.../services/HBASE/configuration/hbase-site.xml | 51 ++++++
.../services/HDFS/configuration/core-site.xml | 14 ++
.../services/HDFS/configuration/hadoop-env.xml | 14 ++
.../HDFS/configuration/hadoop-policy.xml | 11 ++
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HDFS/configuration/hdfs-site.xml | 65 ++++++-
.../services/HDFS/configuration/ssl-client.xml | 7 +
.../services/HDFS/configuration/ssl-server.xml | 8 +
.../services/HIVE/configuration/hcat-env.xml | 1 +
.../services/HIVE/configuration/hive-env.xml | 16 ++
.../HIVE/configuration/hive-exec-log4j.xml | 1 +
.../services/HIVE/configuration/hive-log4j.xml | 1 +
.../services/HIVE/configuration/hive-site.xml | 139 ++++++++++++++-
.../services/HIVE/configuration/webhcat-env.xml | 1 +
.../HIVE/configuration/webhcat-log4j.xml | 1 +
.../HIVE/configuration/webhcat-site.xml | 21 +++
.../KAFKA/configuration/kafka-broker.xml | 66 +++++++-
.../services/KAFKA/configuration/kafka-env.xml | 4 +
.../KAFKA/configuration/kafka-log4j.xml | 1 +
.../KERBEROS/configuration/kerberos-env.xml | 22 ++-
.../KERBEROS/configuration/krb5-conf.xml | 4 +
.../KNOX/configuration/gateway-log4j.xml | 1 +
.../KNOX/configuration/gateway-site.xml | 7 +
.../services/KNOX/configuration/knox-env.xml | 4 +
.../services/KNOX/configuration/ldap-log4j.xml | 1 +
.../services/KNOX/configuration/topology.xml | 1 +
.../services/KNOX/configuration/users-ldif.xml | 1 +
.../services/OOZIE/configuration/oozie-env.xml | 12 ++
.../OOZIE/configuration/oozie-log4j.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 34 ++++
.../4.0/services/PIG/configuration/pig-env.xml | 1 +
.../services/PIG/configuration/pig-log4j.xml | 1 +
.../PIG/configuration/pig-properties.xml | 1 +
.../SLIDER/configuration/slider-client.xml | 1 +
.../SLIDER/configuration/slider-env.xml | 3 +-
.../SLIDER/configuration/slider-log4j.xml | 1 +
.../services/SOLR/configuration/solr-env.xml | 8 +
.../services/SOLR/configuration/solr-log4j.xml | 1 +
.../services/SOLR/configuration/solr-site.xml | 3 +
.../SPARK/configuration/spark-defaults.xml | 16 ++
.../services/SPARK/configuration/spark-env.xml | 6 +
.../configuration/spark-javaopts-properties.xml | 1 +
.../SPARK/configuration/spark-log4j.xml | 1 +
.../configuration/spark-metrics-properties.xml | 1 +
.../services/SQOOP/configuration/sqoop-env.xml | 3 +
.../YARN/configuration-mapred/mapred-env.xml | 5 +
.../YARN/configuration-mapred/mapred-site.xml | 40 +++++
.../YARN/configuration/capacity-scheduler.xml | 15 ++
.../services/YARN/configuration/yarn-env.xml | 10 ++
.../services/YARN/configuration/yarn-log4j.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 78 ++++++++-
.../ZOOKEEPER/configuration/zoo.cfg.xml | 7 +
.../ZOOKEEPER/configuration/zookeeper-env.xml | 4 +
.../ZOOKEEPER/configuration/zookeeper-log4j.xml | 1 +
.../services/FLUME/configuration/flume-env.xml | 2 +
.../services/HDFS/configuration/hadoop-env.xml | 2 +
.../services/HDFS/configuration/hdfs-site.xml | 4 +-
.../services/HIVE/configuration/hive-env.xml | 7 +
.../services/HIVE/configuration/hive-site.xml | 20 ++-
.../services/OOZIE/configuration/oozie-site.xml | 3 +-
.../YARN/configuration-mapred/mapred-site.xml | 3 +
.../services/YARN/configuration/yarn-site.xml | 5 +-
.../services/HBASE/configuration/hbase-site.xml | 3 +
.../services/HDFS/configuration/hdfs-site.xml | 2 +
.../services/HIVE/configuration/hive-site.xml | 1 -
.../HIVE/configuration/ranger-hive-audit.xml | 8 +
.../KNOX/configuration/gateway-site.xml | 1 +
.../services/KNOX/configuration/knox-env.xml | 1 +
.../services/KNOX/configuration/topology.xml | 1 +
.../spark2-javaopts-properties.xml | 1 +
.../YARN/configuration-mapred/mapred-site.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 1 +
.../AMBARI_METRICS/configuration/ams-env.xml | 7 +
.../configuration/ams-hbase-env.xml | 11 ++
.../configuration/ams-hbase-log4j.xml | 1 +
.../configuration/ams-hbase-policy.xml | 3 +
.../configuration/ams-hbase-security-site.xml | 18 ++
.../configuration/ams-hbase-site.xml | 47 ++++++
.../AMBARI_METRICS/configuration/ams-log4j.xml | 1 +
.../AMBARI_METRICS/configuration/ams-site.xml | 51 ++++++
.../services/FLUME/configuration/flume-conf.xml | 1 +
.../services/FLUME/configuration/flume-env.xml | 5 +
.../services/HBASE/configuration/hbase-env.xml | 9 +
.../configuration/hbase-javaopts-properties.xml | 1 +
.../HBASE/configuration/hbase-log4j.xml | 1 +
.../HBASE/configuration/hbase-policy.xml | 3 +
.../services/HBASE/configuration/hbase-site.xml | 57 +++++++
.../HBASE/configuration/ranger-hbase-audit.xml | 16 ++
.../ranger-hbase-plugin-properties.xml | 33 +++-
.../ranger-hbase-policymgr-ssl.xml | 6 +
.../configuration/ranger-hbase-security.xml | 9 +-
.../services/HDFS/configuration/core-site.xml | 17 ++
.../services/HDFS/configuration/hadoop-env.xml | 21 +++
.../HDFS/configuration/hadoop-policy.xml | 11 ++
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HDFS/configuration/hdfs-site.xml | 71 +++++++-
.../HDFS/configuration/ranger-hdfs-audit.xml | 16 ++
.../ranger-hdfs-plugin-properties.xml | 31 ++++
.../configuration/ranger-hdfs-policymgr-ssl.xml | 6 +
.../HDFS/configuration/ranger-hdfs-security.xml | 9 +-
.../services/HDFS/configuration/ssl-client.xml | 7 +
.../services/HDFS/configuration/ssl-server.xml | 8 +
.../services/HIVE/configuration/hcat-env.xml | 1 +
.../services/HIVE/configuration/hive-env.xml | 20 +++
.../HIVE/configuration/hive-exec-log4j.xml | 1 +
.../services/HIVE/configuration/hive-log4j.xml | 1 +
.../services/HIVE/configuration/hive-site.xml | 168 ++++++++++++++++++-
.../HIVE/configuration/hiveserver2-site.xml | 3 +
.../HIVE/configuration/ranger-hive-audit.xml | 16 ++
.../ranger-hive-plugin-properties.xml | 33 +++-
.../configuration/ranger-hive-policymgr-ssl.xml | 8 +-
.../HIVE/configuration/ranger-hive-security.xml | 7 +
.../services/HIVE/configuration/webhcat-env.xml | 1 +
.../HIVE/configuration/webhcat-log4j.xml | 1 +
.../HIVE/configuration/webhcat-site.xml | 21 +++
.../KAFKA/configuration/kafka-broker.xml | 66 +++++++-
.../services/KAFKA/configuration/kafka-env.xml | 6 +
.../KAFKA/configuration/kafka-log4j.xml | 1 +
.../KERBEROS/configuration/kerberos-env.xml | 22 ++-
.../KERBEROS/configuration/krb5-conf.xml | 4 +
.../KNOX/configuration/gateway-log4j.xml | 1 +
.../KNOX/configuration/gateway-site.xml | 7 +
.../services/KNOX/configuration/knox-env.xml | 5 +
.../services/KNOX/configuration/ldap-log4j.xml | 1 +
.../KNOX/configuration/ranger-knox-audit.xml | 16 ++
.../ranger-knox-plugin-properties.xml | 33 +++-
.../configuration/ranger-knox-policymgr-ssl.xml | 8 +-
.../KNOX/configuration/ranger-knox-security.xml | 8 +-
.../services/KNOX/configuration/topology.xml | 1 +
.../services/KNOX/configuration/users-ldif.xml | 1 +
.../services/OOZIE/configuration/oozie-env.xml | 12 ++
.../OOZIE/configuration/oozie-log4j.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 34 ++++
.../4.2/services/PIG/configuration/pig-env.xml | 1 +
.../services/PIG/configuration/pig-log4j.xml | 1 +
.../PIG/configuration/pig-properties.xml | 1 +
.../RANGER/configuration/admin-properties.xml | 25 +++
.../RANGER/configuration/ranger-admin-site.xml | 56 ++++++-
.../RANGER/configuration/ranger-env.xml | 27 +++
.../RANGER/configuration/ranger-site.xml | 9 +-
.../RANGER/configuration/ranger-ugsync-site.xml | 46 +++++
.../configuration/usersync-properties.xml | 19 ++-
.../RANGER_KMS/configuration/dbks-site.xml | 11 ++
.../RANGER_KMS/configuration/kms-env.xml | 4 +
.../RANGER_KMS/configuration/kms-log4j.xml | 3 +-
.../RANGER_KMS/configuration/kms-properties.xml | 11 ++
.../RANGER_KMS/configuration/kms-site.xml | 17 ++
.../configuration/ranger-kms-audit.xml | 16 ++
.../configuration/ranger-kms-policymgr-ssl.xml | 6 +
.../configuration/ranger-kms-security.xml | 6 +
.../configuration/ranger-kms-site.xml | 7 +
.../SLIDER/configuration/slider-client.xml | 1 +
.../SLIDER/configuration/slider-env.xml | 3 +-
.../SLIDER/configuration/slider-log4j.xml | 1 +
.../services/SOLR/configuration/solr-env.xml | 10 ++
.../services/SOLR/configuration/solr-log4j.xml | 1 +
.../services/SOLR/configuration/solr-site.xml | 3 +
.../SPARK/configuration/spark-defaults.xml | 16 ++
.../services/SPARK/configuration/spark-env.xml | 6 +
.../configuration/spark-javaopts-properties.xml | 1 +
.../SPARK/configuration/spark-log4j.xml | 1 +
.../configuration/spark-metrics-properties.xml | 1 +
.../services/SQOOP/configuration/sqoop-env.xml | 3 +
.../services/TITAN/configuration/titan-env.xml | 2 +
.../TITAN/configuration/titan-hbase-solr.xml | 1 +
.../TITAN/configuration/titan-log4j.xml | 1 +
.../YARN/configuration-mapred/mapred-env.xml | 7 +
.../YARN/configuration-mapred/mapred-site.xml | 49 ++++++
.../YARN/configuration/capacity-scheduler.xml | 15 ++
.../YARN/configuration/ranger-yarn-audit.xml | 16 ++
.../ranger-yarn-plugin-properties.xml | 6 +
.../configuration/ranger-yarn-policymgr-ssl.xml | 6 +
.../YARN/configuration/ranger-yarn-security.xml | 6 +
.../services/YARN/configuration/yarn-env.xml | 12 ++
.../services/YARN/configuration/yarn-log4j.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 112 ++++++++++++-
.../ZOOKEEPER/configuration/zoo.cfg.xml | 7 +
.../ZOOKEEPER/configuration/zookeeper-env.xml | 4 +
.../ZOOKEEPER/configuration/zookeeper-log4j.xml | 1 +
195 files changed, 2480 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
index d9a3ac4..b8de740 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.stack;
import java.io.File;
+import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -52,6 +53,7 @@ import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
@@ -447,12 +449,22 @@ public class StackManager {
public static void validateAllPropertyXmlsInFolderRecursively(File stackRoot, Validator validator) throws AmbariException {
Collection<File> files = FileUtils.listFiles(stackRoot, new String[]{"xml"}, true);
for (File file : files) {
+ String path;
+ try {
+ path = file.getCanonicalPath();
+ } catch (IOException ioe) {
+ path = file.getAbsolutePath();
+ }
try {
if (file.getParentFile().getName().contains("configuration")) {
validator.validate(new StreamSource(file));
}
+ } catch (SAXParseException e) {
+ String msg = String.format("File %s:%d didn't pass the validation. Error message: %s", path, e.getLineNumber(), e.getMessage());
+ LOG.error(msg);
+ throw new AmbariException(msg);
} catch (Exception e) {
- String msg = String.format("File %s didn't pass the validation. Error message is : %s", file.getAbsolutePath(), e.getMessage());
+ String msg = String.format("File %s didn't pass the validation. Error message: %s", path, e.getMessage());
LOG.error(msg);
throw new AmbariException(msg);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
index 2d11ef3..c73b6e4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
@@ -61,17 +61,20 @@
<name>security_enabled</name>
<value>false</value>
<description>Hadoop Security</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kerberos_domain</name>
<value>EXAMPLE.COM</value>
<description>Kerberos realm.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ignore_groupsusers_create</name>
<display-name>Skip group modifications during install</display-name>
<value>false</value>
<description>Whether to ignore failures on users and group creation</description>
+ <on-ambari-upgrade add="true"/>
<property-type>ADDITIONAL_USER_PROPERTY</property-type>
<value-attributes>
<overridable>false</overridable>
@@ -82,6 +85,7 @@
<name>smokeuser</name>
<display-name>Smoke User</display-name>
<value>ambari-qa</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>User executing service checks</description>
</property>
@@ -89,11 +93,13 @@
<name>smokeuser_keytab</name>
<value>/etc/security/keytabs/smokeuser.headless.keytab</value>
<description>Path to smoke test user keytab file</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>user_group</name>
<display-name>Hadoop Group</display-name>
<value>hadoop</value>
+ <on-ambari-upgrade add="true"/>
<property-type>GROUP</property-type>
<description>Hadoop user group.</description>
</property>
@@ -113,11 +119,13 @@
<name>tez_tar_source</name>
<value>/usr/iop/current/tez-client/lib/tez.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>tez_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/tez/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property> -->
<!-- Hive tarball is needed by WebHCat. -->
@@ -125,11 +133,13 @@
<name>hive_tar_source</name>
<value>/usr/iop/current/hive-client/hive.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/hive/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Pig tarball is needed by WebHCat. -->
@@ -137,11 +147,13 @@
<name>pig_tar_source</name>
<value>/usr/iop/current/pig-client/pig.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>pig_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/pig/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Hadoop Streaming jar is needed by WebHCat. -->
@@ -149,11 +161,13 @@
<name>hadoop-streaming_tar_source</name>
<value>/usr/iop/current/hadoop-mapreduce-client/hadoop-streaming.jar</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop-streaming_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/mapreduce/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Sqoop tarball is needed by WebHCat. -->
@@ -161,11 +175,13 @@
<name>sqoop_tar_source</name>
<value>/usr/iop/current/sqoop-client/sqoop.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>sqoop_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/sqoop/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- MapReduce2 tarball -->
@@ -173,11 +189,13 @@
<name>mapreduce_tar_source</name>
<value>/usr/iop/current/hadoop-client/mapreduce.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/mapreduce/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -190,17 +208,20 @@ path=/
enabled=1
gpgcheck=0</value>
<description>Template of repositories for rhel and suse.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>repo_ubuntu_template</name>
<value>{{package_type}} {{base_url}} {{components}}</value>
<description>Template of repositories for ubuntu.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>override_uid</name>
<display-name>Have Ambari manage UIDs</display-name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
<property-type>ADDITIONAL_USER_PROPERTY</property-type>
<description>Have Ambari manage UIDs</description>
<value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
index 5910253..158c68f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
@@ -23,6 +23,7 @@
<name>ambari_metrics_user</name>
<display-name>Ambari Metrics User</display-name>
<value>ams</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Ambari Metrics User Name.</description>
</property>
@@ -31,29 +32,34 @@
<value>/var/log/ambari-metrics-collector</value>
<display-name>Metrics Collector log dir</display-name>
<description>Collector log directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_collector_pid_dir</name>
<value>/var/run/ambari-metrics-collector</value>
<display-name>Metrics Collector pid dir</display-name>
<description>Collector pid directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_monitor_pid_dir</name>
<value>/var/run/ambari-metrics-monitor</value>
<display-name>Metrics Monitor pid dir</display-name>
<description>Monitor pid directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_monitor_log_dir</name>
<value>/var/log/ambari-metrics-monitor</value>
<display-name>Metrics Monitor log dir</display-name>
<description>Monitor log directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_collector_heapsize</name>
<value>512</value>
<description>Metrics Collector Heap Size</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -102,6 +108,7 @@ export AMS_COLLECTOR_GC_OPTS="-XX:+UseConcMarkSweepGC -verbose:gc -XX:+PrintGCDe
export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS"
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
index 379297f..b639a35 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
@@ -25,16 +25,19 @@
<name>hbase_log_dir</name>
<value>/var/log/ambari-metrics-collector</value>
<description>Log Directories for HBase.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_pid_dir</name>
<value>/var/run/ambari-metrics-collector/</value>
<description>Pid Directory for HBase.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_classpath_additional</name>
<value></value>
<description>Additional directory or jar in classpath for HBase.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -46,6 +49,7 @@
HBase RegionServer Heap Size. In embedded mode, total heap size is
sum of master and regionserver heap sizes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -65,6 +69,7 @@
<name>regionserver_xmn_size</name>
<value>256</value>
<description>HBase RegionServer maximum value for young generation heap size.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -82,6 +87,7 @@
<description>
HBase Master maximum value for young generation heap size.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -97,6 +103,7 @@
<name>hbase_master_maxperm_size</name>
<value>128</value>
<description>HBase RegionServer maximum value for perm heap size.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -106,6 +113,7 @@
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
<description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_master_heapsize</name>
@@ -114,6 +122,7 @@
HBase Master Heap Size. In embedded mode, total heap size is
sum of master and regionserver heap sizes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -135,6 +144,7 @@
<description>
The maximum number of open file descriptors by process
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- hbase-env.sh -->
@@ -229,6 +239,7 @@ export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
# Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs
export HADOOP_HOME={{ams_hbase_home_dir}}
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
index 52ead29..1a77fab 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
@@ -138,6 +138,7 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<show-property-name>false</show-property-name>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
index febbd44..ba63daa 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
@@ -29,6 +29,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -39,6 +40,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -49,5 +51,6 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
index 5e7bc518..b0bef31 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
@@ -23,6 +23,7 @@
<property>
<name>ams.zookeeper.keytab</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -30,6 +31,7 @@
<property>
<name>ams.zookeeper.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -37,6 +39,7 @@
<property>
<name>hadoop.security.authentication</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -44,6 +47,7 @@
<property>
<name>hbase.coprocessor.master.classes</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -51,6 +55,7 @@
<property>
<name>hbase.coprocessor.region.classes</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -58,6 +63,7 @@
<property>
<name>hbase.master.kerberos.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -65,6 +71,7 @@
<property>
<name>hbase.master.keytab.file</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -72,6 +79,7 @@
<property>
<name>hbase.myclient.keytab</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -79,6 +87,7 @@
<property>
<name>hbase.myclient.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -86,6 +95,7 @@
<property>
<name>hbase.regionserver.kerberos.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -93,6 +103,7 @@
<property>
<name>hbase.regionserver.keytab.file</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -100,6 +111,7 @@
<property>
<name>hbase.security.authentication</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -107,6 +119,7 @@
<property>
<name>hbase.security.authorization</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -114,6 +127,7 @@
<property>
<name>hbase.zookeeper.property.authProvider.1</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -121,6 +135,7 @@
<property>
<name>hbase.zookeeper.property.jaasLoginRenew</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -128,6 +143,7 @@
<property>
<name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -135,6 +151,7 @@
<property>
<name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -142,6 +159,7 @@
<property>
<name>zookeeper.znode.parent</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
index 00d0a2c..45e0fac 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
@@ -29,6 +29,7 @@
HBase to either local filesystem path if using Ambari Metrics in embedded mode or
to a HDFS dir, example: hdfs://namenode.example.org:8020/amshbase.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -39,12 +40,14 @@
than '/tmp' (The '/tmp' directory is often cleared on
machine restart).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.local.dir</name>
<value>${hbase.tmp.dir}/local</value>
<description>Directory on the local filesystem to be used as a local storage
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -54,6 +57,7 @@
standalone mode and true for distributed mode. If false, startup will run
all HBase and ZooKeeper daemons together in the one JVM.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.wait.on.regionservers.mintostart</name>
@@ -61,6 +65,7 @@
<description>
Ensure that HBase Master waits for # many region server to start.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.quorum</name>
@@ -73,31 +78,37 @@
this is the list of servers which we will start/stop ZooKeeper on.
</description>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.bindAddress</name>
<value>0.0.0.0</value>
<description>The bind address for the HBase Master web UI</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.port</name>
<value>61310</value>
<description>The port for the HBase Master web UI.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
<value>61330</value>
<description>The port for the HBase RegionServer web UI.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.port</name>
<value>61300</value>
<description>The port for the HBase Master web UI.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.port</name>
<value>61320</value>
<description>The port for the HBase RegionServer web UI.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.majorcompaction</name>
@@ -107,6 +118,7 @@
HStoreFiles in a region.
0 to disable automated major compactions.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.query.spoolThresholdBytes</name>
@@ -115,6 +127,7 @@
Threshold size in bytes after which results from parallelly executed
query results are spooled to disk. Default is 20 mb.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.property.dataDir</name>
@@ -123,6 +136,7 @@
Property from ZooKeeper's config zoo.cfg.
The directory where the snapshot is stored.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.scanner.caching</name>
@@ -131,17 +145,20 @@
Number of rows that will be fetched when calling next on a scanner
if it is not served from (local, client) memory.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.normalizer.enabled</name>
<value>true</value>
<description>If set to true, Master will try to keep region size
within each table approximately the same.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.normalizer.period</name>
<value>600000</value>
<description>Period in ms at which the region normalizer runs in the Master.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.normalizer.class</name>
@@ -151,6 +168,7 @@
See the class comment for more on how it works
http://hbase.apache.org/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hfile.block.cache.size</name>
@@ -159,6 +177,7 @@
Percentage of maximum heap (-Xmx setting) to allocate to block cache
used by a StoreFile. Default of 0.4 means allocate 40%.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -167,6 +186,7 @@
Maximum size of all memstores in a region server before new
updates are blocked and flushes are forced. Defaults to 40% of heap
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.lowerLimit</name>
@@ -178,6 +198,7 @@
the minimum possible flushing to occur when updates are blocked due to
memstore limiting.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.groupby.maxCacheSize</name>
@@ -185,6 +206,7 @@
<description>
Size in bytes of pages cached during GROUP BY spilling. Default is 100Mb.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -193,6 +215,7 @@
Maximum HFile size. If the sum of the sizes of a region’s HFiles has grown
to exceed this value, the region is split in two. Default is 10Gb.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
@@ -202,6 +225,7 @@
times hbase.hregion.memstore.flush.size bytes. Useful preventing runaway
memstore during spikes in update traffic.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.flusher.count</name>
@@ -211,6 +235,7 @@
will be queued. With more threads, the flushes will be executed in parallel,
increasing the load on HDFS, and potentially causing more compactions.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.query.timeoutMs</name>
@@ -219,6 +244,7 @@
Number of milliseconds after which a query will timeout on the client.
Default is 10 min.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.scanner.timeout.period</name>
@@ -226,6 +252,7 @@
<description>
Client scanner lease period in milliseconds.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.thread.compaction.large</name>
@@ -233,6 +260,7 @@
<description>
Configuration key for the large compaction threads.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.thread.compaction.small</name>
@@ -240,18 +268,22 @@
<description>
Configuration key for the small compaction threads.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
<value>61181</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.peerport</name>
<value>61288</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.leaderport</name>
<value>61388</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.blockingStoreFiles</name>
@@ -262,6 +294,7 @@
this region until a compaction is completed, or until
hbase.hstore.blockingWaitTime has been exceeded.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.flush.size</name>
@@ -271,25 +304,30 @@
number of bytes. Value is checked by a thread that runs every
hbase.server.thread.wakefrequency.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.query.spoolThresholdBytes</name>
<value>12582912</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.snapshot.enabled</name>
<value>false</value>
<description>Enable/Disable HBase snapshots.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.replication</name>
<value>false</value>
<description>Enable/Disable HBase replication.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.session.timeout</name>
<value>120000</value>
<description>ZooKeeper session timeout in milliseconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.session.timeout.localHBaseCluster</name>
@@ -298,6 +336,7 @@
ZooKeeper session timeout in milliseconds for
pseudo distributed mode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.sequence.saltBuckets</name>
@@ -305,6 +344,7 @@
<description>
Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.query.maxGlobalMemoryPercentage</name>
@@ -313,6 +353,7 @@
Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory())
that all threads may use.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.spool.directory</name>
@@ -321,6 +362,7 @@
Set directory for Phoenix spill files. If possible set this to a
different mount point from the one for hbase.rootdir in embedded mode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.mutate.batchSize</name>
@@ -330,6 +372,7 @@
during the execution of an UPSERT SELECT or DELETE statement.
This affects performance of group by aggregators if they are being used.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.query.rowKeyOrderSaltedTable</name>
@@ -340,6 +383,7 @@
When this property is turned on, the salted table would behave just like
a normal table and would return items in rowkey order for scans
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.coprocessor.maxServerCacheTimeToLiveMs</name>
@@ -352,6 +396,7 @@
“Earlier hash cache(s) might have expired on servers” might also be a
sign that this number should be increased.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.coprocessor.maxMetaDataCacheSize</name>
@@ -361,6 +406,7 @@
evictions will begin to occur based on least recent access time.
Default is 20Mb
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.client.read.shortcircuit</name>
@@ -369,6 +415,7 @@
Hadoop servers should be configured to allow short circuit read
for the hbase user for this to take effect
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ams-hbase-site</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml
index 2b0a4cf..aa379d9 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml
@@ -57,6 +57,7 @@ log4j.appender.file.MaxBackupIndex=60
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<show-property-name>false</show-property-name>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml
index cc9c27a..789ed02 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml
@@ -30,6 +30,7 @@
1) embedded: Metrics stored on local FS, HBase in Standalone mode
2) distributed: HBase daemons writing to HDFS
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.webapp.address</name>
@@ -37,6 +38,7 @@
<description>
The address of the metrics service web application.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.rpc.address</name>
@@ -44,6 +46,7 @@
<description>
The address of the metrics service rpc listeners.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.aggregator.checkpoint.dir</name>
@@ -53,6 +56,7 @@
Directory to store aggregator checkpoints. Change to a permanent
location so that checkpoint ar not lost.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -65,6 +69,7 @@
Time in seconds to sleep for the minute resolution host based
aggregator. Default resolution is 5 minutes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -77,6 +82,7 @@
Time in seconds to sleep for the hourly resolution host based
aggregator. Default resolution is 1 hour.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -88,6 +94,7 @@
Time in seconds to sleep for the day resolution host based
aggregator. Default resolution is 24 hours.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.interval</name>
@@ -97,6 +104,7 @@
Time in seconds to sleep for the hourly resolution cluster wide
aggregator. Default is 1 hour.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -108,6 +116,7 @@
Time in seconds to sleep for the day resolution cluster wide
aggregator. Default is 24 hours.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.minute.interval</name>
@@ -117,6 +126,7 @@
Time in seconds to sleep for the minute resolution cluster wide
aggregator. Default resolution is 5 minutes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -129,6 +139,7 @@
Time in seconds to sleep for the second resolution cluster wide
aggregator. Default resolution is 2 minutes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -141,6 +152,7 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier</name>
@@ -151,6 +163,7 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -164,6 +177,7 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -177,6 +191,7 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -190,6 +205,7 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -203,6 +219,7 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -215,6 +232,7 @@
if aggregator checkpoint is greater than max allowed checkpoint delay,
the checkpoint will be discarded by the aggregator.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.daily.disabled</name>
@@ -222,6 +240,7 @@
<description>
Disable host based daily aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.hourly.disabled</name>
@@ -230,6 +249,7 @@
<description>
Disable host based hourly aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.minute.disabled</name>
@@ -238,6 +258,7 @@
<description>
Disable host based minute aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.daily.disabled</name>
@@ -245,6 +266,7 @@
<description>
Disable cluster based daily aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.disabled</name>
@@ -253,6 +275,7 @@
<description>
Disable cluster based hourly aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.minute.disabled</name>
@@ -261,6 +284,7 @@
<description>
Disable cluster based minute aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.disabled</name>
@@ -269,6 +293,7 @@
<description>
Disable cluster based second aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.timeslice.interval</name>
@@ -277,6 +302,7 @@
<description>
Lowest resolution of desired data for cluster level second aggregates.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -287,6 +313,7 @@
<description>
Host based daily resolution data purge interval. Default is 1 year.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.hourly.ttl</name>
@@ -294,6 +321,7 @@
<description>
Host based hourly resolution data purge interval. Default is 30 days.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.minute.ttl</name>
@@ -301,6 +329,7 @@
<description>
Host based minute resolution data purge interval. Default is 7 days.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.second.ttl</name>
@@ -308,6 +337,7 @@
<description>
Cluster wide second resolution data purge interval. Default is 7 days.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.minute.ttl</name>
@@ -315,6 +345,7 @@
<description>
Cluster wide minute resolution data purge interval. Default is 30 days.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.hourly.ttl</name>
@@ -322,6 +353,7 @@
<description>
Cluster wide hourly resolution data purge interval. Default is 1 year.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.cluster.aggregator.daily.ttl</name>
@@ -329,6 +361,7 @@
<description>
Cluster wide daily resolution data purge interval. Default is 2 years.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregator.ttl</name>
@@ -336,6 +369,7 @@
<description>
1 minute resolution data purge interval. Default is 1 day.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.hbase.data.block.encoding</name>
@@ -345,6 +379,7 @@
Default encoding is FAST_DIFF. This can be changed only before creating
tables.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.hbase.compression.scheme</name>
@@ -354,6 +389,7 @@
scheme. Default compression is SNAPPY. Disable by setting to None.
This can be changed only before creating tables.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.default.result.limit</name>
@@ -363,6 +399,7 @@
22 aggregate metrics/min * 2 * 60 * 6 : Retrieve 10 SECOND data for 2 hours.
</description>
<display-name>Metrics service default result limit</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -375,6 +412,7 @@
Time in seconds to sleep on the first run or when the checkpoint is
too old.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -386,6 +424,7 @@
<description>
JDBC resultset prefect size for aggregator queries.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -398,6 +437,7 @@
Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory())
that all threads may use.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>phoenix.spool.directory</name>
@@ -406,6 +446,7 @@
Set directory for Phoenix spill files. If possible set this to a
different mount point from the one for hbase.rootdir in embedded mode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.cluster.aggregator.appIds</name>
@@ -414,6 +455,7 @@
List of application ids to use for aggregating host level metrics for
an application. Example: bytes_read across Yarn Nodemanagers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.use.groupBy.aggregators</name>
@@ -422,6 +464,7 @@
Use a groupBy aggregated query to perform host level aggregations vs
in-memory aggregations.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.host.aggregate.splitpoints</name>
@@ -430,6 +473,7 @@
Pre-split regions using the split points corresponding to this property
for the precision table that stores seconds aggregate data.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ams-hbase-site</type>
@@ -456,6 +500,7 @@
Pre-split regions using the split points corresponding to this property
for the aggregate table that stores seconds aggregate data across hosts.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ams-hbase-site</type>
@@ -483,6 +528,7 @@
Time in seconds to sleep before report metrics to collector.
Default resolution is 1 minute.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.sink.collection.period</name>
@@ -490,6 +536,7 @@
<description>
The interval between two service metrics data exports.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.watcher.initial.delay</name>
@@ -498,6 +545,7 @@
The time to delay first watcher check execution
Default resolution is 10 minutes.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.watcher.delay</name>
@@ -507,6 +555,7 @@
watcher check execution and the commencement of the next
Default resolution is 30 seconds.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.service.watcher.timeout</name>
@@ -515,6 +564,7 @@
The maximum time to wait for a single watcher check execution
Default resolution is 30 seconds.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>timeline.metrics.hbase.fifo.compaction.enabled</name>
@@ -522,6 +572,7 @@
<description>
Enable Compaction policy for lower precision and minute aggregate tables.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml
index 582e181..892efa4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml
@@ -29,6 +29,7 @@
<value>
# Flume agent config
</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml
index a448a66..3b14a58 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml
@@ -26,6 +26,7 @@
<display-name>Flume Conf Dir</display-name>
<value>/etc/flume/conf</value>
<description>Location to save configuration files</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -37,6 +38,7 @@
<display-name>Flume Log Dir</display-name>
<value>/var/log/flume</value>
<description>Location to save log files</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -46,6 +48,7 @@
<property>
<name>flume_user</name>
<value>flume</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Flume User</description>
</property>
@@ -86,5 +89,6 @@ export JAVA_HOME={{java_home}}
export HIVE_HOME={{flume_hive_home}}
export HCAT_HOME={{flume_hcat_home}}
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml
index 47a2bb6..d9700ee 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml
@@ -26,6 +26,7 @@
<display-name>HBase Log Dir Prefix</display-name>
<value>/var/log/hbase</value>
<description>Log Directories for HBase.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -37,6 +38,7 @@
<display-name>HBase PID Dir</display-name>
<value>/var/run/hbase</value>
<description>Pid Directory for HBase.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -48,6 +50,7 @@
<value>2048</value>
<description>Maximum amount of memory each HBase RegionServer can use.</description>
<display-name>HBase RegionServer Maximum Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1024</minimum>
@@ -64,6 +67,7 @@
and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
</description>
<display-name>RegionServers maximum value for -Xmn</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -74,6 +78,7 @@
<display-name>RegionServers -Xmn in -Xmx ratio</display-name>
<value>0.2</value>
<description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
</value-attributes>
@@ -83,6 +88,7 @@
<value>2048</value>
<description>Maximum amount of memory each HBase Master can use.</description>
<display-name>HBase Master Maximum Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1024</minimum>
@@ -94,6 +100,7 @@
<property>
<name>hbase_user</name>
<value>hbase</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>HBase User Name.</description>
</property>
@@ -170,6 +177,7 @@ export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}}"
export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 -Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
{% endif %}
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml
index 3eca77a..a580077 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml
@@ -23,5 +23,6 @@
<name>content</name>
<description>Hbase-javaopts-properties</description>
<value> </value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml
index 2e8fb3d..b516c6f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml
@@ -138,6 +138,7 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml
index b0807b6..5d95449 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml
@@ -29,6 +29,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -39,6 +40,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -49,5 +51,6 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml
index d4cca6c..40d6a79 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml
@@ -32,6 +32,7 @@
into /tmp. Change this configuration else all data will be lost
on machine restart.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -41,12 +42,14 @@
false, startup will run all HBase and ZooKeeper daemons together
in the one JVM.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.port</name>
<value>60000</value>
<display-name>HBase Master Port</display-name>
<description>The port the HBase Master should bind to.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>int</type>
@@ -61,6 +64,7 @@
machine restart).
</description>
<display-name>HBase tmp directory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -70,27 +74,32 @@
<value>${hbase.tmp.dir}/local</value>
<description>Directory on the local filesystem to be used as a local storage
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.bindAddress</name>
<value>0.0.0.0</value>
<description>The bind address for the HBase Master web UI
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.port</name>
<value>60010</value>
<description>The port for the HBase Master web UI.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.port</name>
<value>60020</value>
<description>The port the HBase Region Server should bind to.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
<value>60030</value>
<description>The port for the HBase RegionServer web UI.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -103,6 +112,7 @@
watermark (hbase.regionserver.global.memstore.size.lower.limit) is reached.
</description>
<display-name>% of RegionServer Allocated to Write Buffers</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0</minimum>
@@ -117,6 +127,7 @@
Same property is used by the Master for count of master handlers.
</description>
<display-name>Number of Handlers per RegionServer</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>5</minimum>
@@ -131,6 +142,7 @@
Time between major compactions. Set to 0 to disable automatic major compactions.
</description>
<display-name>Major Compaction Interval</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -145,6 +157,7 @@
a given amount of time either side of hbase.hregion.majorcompaction. The smaller the number,
the closer the compactions will happen to the hbase.hregion.majorcompaction
interval.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -156,6 +169,7 @@
the minimum possible flushing to occur when updates are blocked due to
memstore limiting.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
</value-attributes>
@@ -172,6 +186,7 @@
worse, we OOME.
</description>
<display-name>Per-Column Family Memstore Block Multiplier</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -195,6 +210,7 @@
The size of an individual memstore. Each column familiy within each region is allocated its own memstore.
</description>
<display-name>Per-Column Family Memstore Flush Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>33554432</minimum>
@@ -212,6 +228,7 @@
heavy write loads. This can reduce the frequency of stop-the-world
GC pauses on large heaps.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -224,6 +241,7 @@
value, the region is split in two.
</description>
<display-name>Maximum Region File Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1073741824</minimum>
@@ -243,6 +261,7 @@
than the scanner timeout; i.e. hbase.regionserver.lease.period
</description>
<display-name>Number of Fetched Rows when Scanning from Disk</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>100</minimum>
@@ -265,6 +284,7 @@
it will take precedence.
</description>
<display-name>Zookeeper Session Timeout</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>10000</minimum>
@@ -284,6 +304,7 @@
or less disables the check.
</description>
<display-name>Maximum Record Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1048576</minimum>
@@ -303,6 +324,7 @@
cases, the default value is appropriate.
</description>
<display-name>Maximum Store Files before Minor Compaction</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<entries>
@@ -324,6 +346,7 @@
<description>
The number of times the region flush operation will be retried.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -336,6 +359,7 @@
blocked for this HRegion until a compaction is completed, or
until hbase.hstore.blockingWaitTime has been exceeded.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -345,6 +369,7 @@
<value>0.40</value>
<description>Percentage of RegionServer memory to allocate to read buffers.</description>
<display-name>% of RegionServer Allocated to Read Buffers</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0</minimum>
@@ -362,6 +387,7 @@
<description>Full path to the kerberos keytab file to use for logging in
the configured HMaster server principal.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.kerberos.principal</name>
@@ -372,6 +398,7 @@
portion, it will be replaced with the actual hostname of the running
instance.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.keytab.file</name>
@@ -379,6 +406,7 @@
<description>Full path to the kerberos keytab file to use for logging in
the configured HRegionServer server principal.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.kerberos.principal</name>
@@ -390,23 +418,28 @@
running instance. An entry for this principal must exist in the file
specified in hbase.regionserver.keytab.file
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.rest.keytab.file</name>
<value>/etc/security/keytabs/hbase.service.keytab</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.rest.kerberos.principal</name>
<value>hbase/_HOST@EXAMPLE.COM</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.rest.authentication.kerberos.keytab</name>
<value>/etc/security/keytabs/hbase.service.keytab</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.rest.authentication.kerberos.principal</name>
<value>HTTP/_HOST@EXAMPLE.COM</value>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Additional configuration specific to HBase security -->
@@ -417,6 +450,7 @@
full privileges, regardless of stored ACLs, across the cluster.
Only used when HBase security is enabled.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -426,6 +460,7 @@
Select Simple or Kerberos authentication. Note: Kerberos must be set up before the Kerberos option will take effect.
</description>
<display-name>Enable Authentication</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -447,6 +482,7 @@
<value>false</value>
<description> Set Authorization Method.</description>
<display-name>Enable Authorization</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -472,6 +508,7 @@
it in HBase's classpath and add the fully qualified class name here.
A coprocessor can also be loaded on demand by setting HTableDescriptor.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -497,6 +534,7 @@
implementing your own MasterObserver, just put it in HBase's classpath
and add the fully qualified class name here.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -514,6 +552,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
@@ -530,6 +569,7 @@
list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in hbase-env.sh
this is the list of servers which we will start/stop ZooKeeper on.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>multiLine</type>
</value-attributes>
@@ -546,6 +586,7 @@
and will not be downgraded. ZooKeeper versions before 3.4 do not support multi-update and will
not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.znode.parent</name>
@@ -555,6 +596,7 @@
By default, all of HBase's ZooKeeper file path are configured with a
relative path, so they will all go under this directory unless changed.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -567,6 +609,7 @@
retrying every ten seconds. See HConstants#RETRY_BACKOFF for how the backup
ramps up. Change this setting and hbase.client.pause to suit your workload.</description>
<display-name>Maximum Client Retries</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>5</minimum>
@@ -584,6 +627,7 @@
but will eventually throw a TimeoutException.
</description>
<display-name>HBase RPC Timeout</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>10000</minimum>
@@ -603,6 +647,7 @@
cases, the default value is appropriate.
</description>
<display-name>Maximum Files in a Store before Compaction</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<entries>
@@ -643,6 +688,7 @@
(hbase.regionserver.global.memstore.size.lower.limit) is reached.
</description>
<display-name>% of RegionServer Allocated to Write Buffers</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0</minimum>
@@ -655,27 +701,32 @@
<name>hbase.defaults.for.version.skip</name>
<value>true</value>
<description>Disables version verification.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.domain.socket.path</name>
<value>/var/lib/hadoop-hdfs/dn_socket</value>
<description>Path to domain socket.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.replication</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.rest.authentication.type</name>
<value>simple</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.rest.port</name>
<value>8091</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>