AMBARI-17112. Fixed implementation of on-ambari-upgrade support. Update all stack configuration xmls to pass validation. Change defaults (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa1b536d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa1b536d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa1b536d Branch: refs/heads/trunk Commit: fa1b536dac9e3c51e56a8b7f0482828cd3de4df9 Parents: 6d97cba Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Jun 9 17:56:11 2016 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Jun 9 17:56:11 2016 +0300 ---------------------------------------------------------------------- .../1.6.1.2.2.0/configuration/accumulo-env.xml | 34 +- .../configuration/accumulo-log4j.xml | 14 +- .../1.6.1.2.2.0/configuration/accumulo-site.xml | 34 +- .../0.1.0/configuration/ams-env.xml | 14 +- .../0.1.0/configuration/ams-grafana-env.xml | 12 +- .../0.1.0/configuration/ams-grafana-ini.xml | 10 +- .../0.1.0/configuration/ams-hbase-env.xml | 22 +- .../0.1.0/configuration/ams-hbase-log4j.xml | 2 +- .../0.1.0/configuration/ams-hbase-policy.xml | 6 +- .../configuration/ams-hbase-security-site.xml | 34 +- .../0.1.0/configuration/ams-hbase-site.xml | 100 +++--- .../0.1.0/configuration/ams-log4j.xml | 2 +- .../0.1.0/configuration/ams-site.xml | 120 +++---- .../0.1.0/configuration/ams-ssl-client.xml | 6 +- .../0.1.0/configuration/ams-ssl-server.xml | 16 +- .../0.1.0/configuration/storm-site.xml | 2 +- .../configuration/application-properties.xml | 70 ++--- .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 18 +- .../0.1.0.2.3/configuration/atlas-log4j.xml | 6 +- .../0.5.0.2.1/configuration/falcon-env.xml | 22 +- .../configuration/falcon-runtime.properties.xml | 10 +- .../configuration/falcon-startup.properties.xml | 62 ++-- .../0.5.0.2.1/configuration/oozie-site.xml | 16 +- .../1.4.0.2.0/configuration/flume-conf.xml | 2 +- .../FLUME/1.4.0.2.0/configuration/flume-env.xml | 10 +- .../GANGLIA/3.5.0/configuration/ganglia-env.xml | 20 +- .../HAWQ/2.0.0/configuration/hawq-check-env.xml | 2 +- .../HAWQ/2.0.0/configuration/hawq-env.xml | 4 +- .../2.0.0/configuration/hawq-limits-env.xml | 8 +- .../HAWQ/2.0.0/configuration/hawq-site.xml | 38 +-- .../2.0.0/configuration/hawq-sysctl-env.xml | 48 +-- .../HAWQ/2.0.0/configuration/hdfs-client.xml | 64 ++-- .../HAWQ/2.0.0/configuration/yarn-client.xml | 20 +- .../0.96.0.2.0/configuration/hbase-env.xml | 26 +- .../0.96.0.2.0/configuration/hbase-log4j.xml | 2 +- .../0.96.0.2.0/configuration/hbase-policy.xml | 6 +- .../0.96.0.2.0/configuration/hbase-site.xml | 76 ++--- .../HDFS/2.1.0.2.0/configuration/core-site.xml | 30 +- .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 36 +-- .../2.1.0.2.0/configuration/hadoop-policy.xml | 22 +- .../HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml | 2 +- .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 96 +++--- .../HDFS/2.1.0.2.0/configuration/ssl-client.xml | 14 +- .../HDFS/2.1.0.2.0/configuration/ssl-server.xml | 16 +- .../HIVE/0.12.0.2.0/configuration/hcat-env.xml | 2 +- .../HIVE/0.12.0.2.0/configuration/hive-env.xml | 32 +- .../configuration/hive-exec-log4j.xml | 2 +- .../0.12.0.2.0/configuration/hive-log4j.xml | 2 +- .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 98 +++--- .../0.12.0.2.0/configuration/webhcat-env.xml | 2 +- .../0.12.0.2.0/configuration/webhcat-log4j.xml | 2 +- .../0.12.0.2.0/configuration/webhcat-site.xml | 38 +-- .../KAFKA/0.8.1/configuration/kafka-broker.xml | 106 +++---- .../KAFKA/0.8.1/configuration/kafka-env.xml | 18 +- .../KAFKA/0.8.1/configuration/kafka-log4j.xml | 2 +- .../KAFKA/0.9.0/configuration/kafka-broker.xml | 46 +-- .../KAFKA/0.9.0/configuration/kafka-env.xml | 2 +- .../0.9.0/configuration/ranger-kafka-audit.xml | 32 +- .../ranger-kafka-plugin-properties.xml | 14 +- .../ranger-kafka-policymgr-ssl.xml | 12 +- .../configuration/ranger-kafka-security.xml | 12 +- .../1.10.3-10/configuration/kerberos-env.xml | 50 +-- .../1.10.3-10/configuration/krb5-conf.xml | 8 +- .../0.5.0.2.2/configuration/admin-topology.xml | 2 +- .../0.5.0.2.2/configuration/gateway-log4j.xml | 2 +- .../0.5.0.2.2/configuration/gateway-site.xml | 14 +- .../KNOX/0.5.0.2.2/configuration/knox-env.xml | 12 +- .../KNOX/0.5.0.2.2/configuration/ldap-log4j.xml | 2 +- .../ranger-knox-plugin-properties.xml | 62 ++-- .../KNOX/0.5.0.2.2/configuration/topology.xml | 2 +- .../KNOX/0.5.0.2.2/configuration/users-ldif.xml | 2 +- .../0.5.0/configuration/logfeeder-env.xml | 28 +- .../0.5.0/configuration/logfeeder-log4j.xml | 2 +- .../configuration/logfeeder-properties.xml | 10 +- .../configuration/logsearch-admin-json.xml | 6 +- .../logsearch-audit_logs-solrconfig.xml | 6 +- .../0.5.0/configuration/logsearch-env.xml | 36 +-- .../0.5.0/configuration/logsearch-log4j.xml | 2 +- .../configuration/logsearch-properties.xml | 28 +- .../logsearch-service_logs-solrconfig.xml | 6 +- .../logsearch-solr-client-log4j.xml | 2 +- .../0.5.0/configuration/logsearch-solr-env.xml | 38 +-- .../configuration/logsearch-solr-log4j.xml | 2 +- .../0.5.0/configuration/logsearch-solr-xml.xml | 2 +- .../1.0.0.2.3/configuration/mahout-env.xml | 2 +- .../1.0.0.2.3/configuration/mahout-log4j.xml | 2 +- .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 26 +- .../4.0.0.2.0/configuration/oozie-log4j.xml | 2 +- .../4.0.0.2.0/configuration/oozie-site.xml | 60 ++-- .../OOZIE/4.2.0.2.3/configuration/oozie-env.xml | 2 +- .../4.2.0.2.3/configuration/oozie-log4j.xml | 2 +- .../4.2.0.2.3/configuration/oozie-site.xml | 30 +- .../PIG/0.12.0.2.0/configuration/pig-env.xml | 2 +- .../PIG/0.12.0.2.0/configuration/pig-log4j.xml | 2 +- .../0.12.0.2.0/configuration/pig-properties.xml | 2 +- .../PXF/3.0.0/configuration/pxf-profiles.xml | 2 +- .../configuration/pxf-public-classpath.xml | 2 +- .../PXF/3.0.0/configuration/pxf-site.xml | 2 +- .../0.4.0/configuration/admin-properties.xml | 50 +-- .../RANGER/0.4.0/configuration/ranger-env.xml | 40 +-- .../RANGER/0.4.0/configuration/ranger-site.xml | 14 +- .../0.4.0/configuration/usersync-properties.xml | 34 +- .../0.5.0/configuration/admin-properties.xml | 30 +- .../0.5.0/configuration/ranger-admin-site.xml | 110 +++---- .../RANGER/0.5.0/configuration/ranger-env.xml | 22 +- .../RANGER/0.5.0/configuration/ranger-site.xml | 14 +- .../0.5.0/configuration/ranger-ugsync-site.xml | 92 +++--- .../0.5.0/configuration/usersync-properties.xml | 34 +- .../RANGER/0.6.0/configuration/admin-log4j.xml | 2 +- .../0.6.0/configuration/admin-properties.xml | 6 +- .../0.6.0/configuration/ranger-admin-site.xml | 48 +-- .../RANGER/0.6.0/configuration/ranger-env.xml | 8 +- .../0.6.0/configuration/ranger-tagsync-site.xml | 32 +- .../0.6.0/configuration/ranger-ugsync-site.xml | 14 +- .../tagsync-application-properties.xml | 6 +- .../0.6.0/configuration/tagsync-log4j.xml | 2 +- .../0.6.0/configuration/usersync-log4j.xml | 2 +- .../0.5.0.2.3/configuration/dbks-site.xml | 22 +- .../0.5.0.2.3/configuration/kms-env.xml | 10 +- .../0.5.0.2.3/configuration/kms-log4j.xml | 2 +- .../0.5.0.2.3/configuration/kms-properties.xml | 22 +- .../0.5.0.2.3/configuration/kms-site.xml | 34 +- .../configuration/ranger-kms-audit.xml | 32 +- .../configuration/ranger-kms-policymgr-ssl.xml | 12 +- .../configuration/ranger-kms-security.xml | 12 +- .../0.5.0.2.3/configuration/ranger-kms-site.xml | 14 +- .../0.60.0.2.2/configuration/slider-env.xml | 2 +- .../0.60.0.2.2/configuration/slider-log4j.xml | 2 +- .../1.2.1/configuration/spark-defaults.xml | 34 +- .../SPARK/1.2.1/configuration/spark-env.xml | 14 +- .../configuration/spark-log4j-properties.xml | 2 +- .../configuration/spark-metrics-properties.xml | 2 +- .../configuration/spark-hive-site-override.xml | 10 +- .../configuration/spark-thrift-sparkconf.xml | 20 +- .../1.6.0/configuration/spark-defaults.xml | 10 +- .../spark-thrift-fairscheduler.xml | 2 +- .../configuration/spark-thrift-sparkconf.xml | 48 +-- .../2.0.0/configuration/spark2-defaults.xml | 20 +- .../SPARK2/2.0.0/configuration/spark2-env.xml | 12 +- .../configuration/spark2-hive-site-override.xml | 10 +- .../configuration/spark2-log4j-properties.xml | 2 +- .../configuration/spark2-metrics-properties.xml | 2 +- .../spark2-thrift-fairscheduler.xml | 2 +- .../configuration/spark2-thrift-sparkconf.xml | 30 +- .../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml | 6 +- .../1.4.4.2.0/configuration/sqoop-site.xml | 4 +- .../0.10.0/configuration/ranger-storm-audit.xml | 32 +- .../ranger-storm-plugin-properties.xml | 50 +-- .../ranger-storm-policymgr-ssl.xml | 12 +- .../configuration/ranger-storm-security.xml | 12 +- .../configuration/storm-cluster-log4j.xml | 2 +- .../STORM/0.10.0/configuration/storm-env.xml | 6 +- .../STORM/0.10.0/configuration/storm-site.xml | 12 +- .../0.10.0/configuration/storm-worker-log4j.xml | 2 +- .../STORM/0.9.1/configuration/storm-env.xml | 32 +- .../STORM/0.9.1/configuration/storm-site.xml | 192 ++++++------ .../ranger-storm-plugin-properties.xml | 60 ++-- .../STORM/0.9.3/configuration/storm-env.xml | 2 +- .../STORM/0.9.3/configuration/storm-site.xml | 28 +- .../1.0.1/configuration/ranger-storm-audit.xml | 14 +- .../STORM/1.0.1/configuration/storm-site.xml | 18 +- .../TEZ/0.4.0.2.1/configuration/tez-env.xml | 4 +- .../TEZ/0.4.0.2.1/configuration/tez-site.xml | 50 +-- .../configuration-mapred/mapred-env.xml | 14 +- .../configuration-mapred/mapred-site.xml | 78 ++--- .../configuration/capacity-scheduler.xml | 26 +- .../YARN/2.1.0.2.0/configuration/yarn-env.xml | 24 +- .../YARN/2.1.0.2.0/configuration/yarn-log4j.xml | 2 +- .../YARN/2.1.0.2.0/configuration/yarn-site.xml | 78 ++--- .../0.6.0.2.5/configuration/zeppelin-config.xml | 46 +-- .../0.6.0.2.5/configuration/zeppelin-env.xml | 20 +- .../ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml | 14 +- .../3.4.5/configuration/zookeeper-env.xml | 14 +- .../3.4.5/configuration/zookeeper-log4j.xml | 2 +- .../src/main/resources/configuration-schema.xsd | 7 +- .../configurations-set-default-update-policy.sh | 2 - .../BIGTOP/0.8/configuration/cluster-env.xml | 12 +- .../services/FLUME/configuration/flume-conf.xml | 2 +- .../services/FLUME/configuration/flume-env.xml | 8 +- .../FLUME/configuration/flume-log4j.xml | 2 +- .../GANGLIA/configuration/ganglia-env.xml | 20 +- .../services/HBASE/configuration/hbase-env.xml | 16 +- .../HBASE/configuration/hbase-log4j.xml | 2 +- .../HBASE/configuration/hbase-policy.xml | 6 +- .../services/HBASE/configuration/hbase-site.xml | 68 ++-- .../services/HDFS/configuration/core-site.xml | 26 +- .../services/HDFS/configuration/hadoop-env.xml | 26 +- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-log4j.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 94 +++--- .../services/HIVE/configuration/hcat-env.xml | 2 +- .../services/HIVE/configuration/hive-env.xml | 26 +- .../HIVE/configuration/hive-exec-log4j.xml | 2 +- .../services/HIVE/configuration/hive-log4j.xml | 2 +- .../services/HIVE/configuration/hive-site.xml | 144 ++++----- .../services/HIVE/configuration/webhcat-env.xml | 2 +- .../HIVE/configuration/webhcat-site.xml | 36 +-- .../services/OOZIE/configuration/oozie-env.xml | 16 +- .../OOZIE/configuration/oozie-log4j.xml | 2 +- .../services/OOZIE/configuration/oozie-site.xml | 58 ++-- .../0.8/services/PIG/configuration/pig-env.xml | 2 +- .../services/PIG/configuration/pig-log4j.xml | 2 +- .../PIG/configuration/pig-properties.xml | 2 +- .../YARN/configuration-mapred/mapred-env.xml | 10 +- .../YARN/configuration-mapred/mapred-site.xml | 74 ++--- .../YARN/configuration/capacity-scheduler.xml | 26 +- .../services/YARN/configuration/yarn-env.xml | 18 +- .../services/YARN/configuration/yarn-log4j.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 94 +++--- .../ZOOKEEPER/configuration/zookeeper-env.xml | 18 +- .../ZOOKEEPER/configuration/zookeeper-log4j.xml | 2 +- .../GLUSTERFS/configuration/core-site.xml | 10 +- .../GLUSTERFS/configuration/hadoop-env.xml | 20 +- .../services/HBASE/configuration/hbase-site.xml | 76 ++--- .../services/HDFS/configuration/core-site.xml | 24 +- .../services/HDFS/configuration/global.xml | 68 ++-- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-site.xml | 116 +++---- .../services/HIVE/configuration/hive-site.xml | 142 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 58 ++-- .../PIG/configuration/pig-properties.xml | 2 +- .../YARN/configuration-mapred/mapred-site.xml | 22 +- .../YARN/configuration/capacity-scheduler.xml | 26 +- .../services/YARN/configuration/yarn-env.xml | 18 +- .../services/YARN/configuration/yarn-site.xml | 94 +++--- .../HDP/2.0.6/configuration/cluster-env.xml | 48 +-- .../services/OOZIE/configuration/oozie-env.xml | 2 +- .../FALCON/configuration/falcon-env.xml | 16 +- .../configuration/falcon-runtime.properties.xml | 10 +- .../configuration/falcon-startup.properties.xml | 68 ++-- .../FALCON/configuration/oozie-site.xml | 14 +- .../GLUSTERFS/configuration/core-site.xml | 6 +- .../GLUSTERFS/configuration/hadoop-env.xml | 20 +- .../services/HBASE/configuration/hbase-site.xml | 76 ++--- .../services/HIVE/configuration/hive-site.xml | 142 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 58 ++-- .../PIG/configuration/pig-properties.xml | 2 +- .../services/STORM/configuration/storm-env.xml | 6 +- .../services/STORM/configuration/storm-site.xml | 188 +++++------ .../services/TEZ/configuration/tez-env.xml | 2 +- .../services/TEZ/configuration/tez-site.xml | 50 +-- .../YARN/configuration-mapred/mapred-site.xml | 22 +- .../YARN/configuration-mapred/ssl-client.xml | 14 +- .../YARN/configuration-mapred/ssl-server.xml | 16 +- .../YARN/configuration/capacity-scheduler.xml | 26 +- .../services/YARN/configuration/yarn-env.xml | 18 +- .../services/YARN/configuration/yarn-site.xml | 94 +++--- .../FALCON/configuration/oozie-site.xml | 16 +- .../services/HDFS/configuration/hdfs-site.xml | 4 +- .../services/HIVE/configuration/hive-site.xml | 150 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 56 ++-- .../PIG/configuration/pig-properties.xml | 2 +- .../services/YARN/configuration/yarn-env.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 20 +- .../configuration/falcon-startup.properties.xml | 30 +- .../FALCON/configuration/oozie-site.xml | 16 +- .../services/HBASE/configuration/hbase-env.xml | 16 +- .../services/HBASE/configuration/hbase-site.xml | 36 +-- .../ranger-hbase-plugin-properties.xml | 62 ++-- .../services/HDFS/configuration/core-site.xml | 4 +- .../services/HDFS/configuration/hadoop-env.xml | 6 +- .../services/HDFS/configuration/hdfs-log4j.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 10 +- .../ranger-hdfs-plugin-properties.xml | 62 ++-- .../services/HIVE/configuration/hive-env.xml | 12 +- .../services/HIVE/configuration/hive-site.xml | 310 +++++++++--------- .../HIVE/configuration/hiveserver2-site.xml | 8 +- .../ranger-hive-plugin-properties.xml | 62 ++-- .../HIVE/configuration/webhcat-site.xml | 30 +- .../ranger-knox-plugin-properties.xml | 2 +- .../services/OOZIE/configuration/oozie-env.xml | 2 +- .../services/OOZIE/configuration/oozie-site.xml | 12 +- .../services/STORM/configuration/storm-site.xml | 8 +- .../2.2/services/TEZ/configuration/tez-site.xml | 86 ++--- .../YARN/configuration-mapred/mapred-env.xml | 2 +- .../YARN/configuration-mapred/mapred-site.xml | 22 +- .../YARN/configuration/capacity-scheduler.xml | 6 +- .../services/YARN/configuration/yarn-env.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 124 ++++---- .../services/ECS/configuration/core-site.xml | 32 +- .../services/ECS/configuration/hadoop-env.xml | 10 +- .../services/ECS/configuration/hdfs-site.xml | 4 +- .../services/HBASE/configuration/hbase-env.xml | 2 +- .../services/HBASE/configuration/hbase-site.xml | 2 +- .../services/TEZ/configuration/tez-site.xml | 2 +- .../YARN/configuration-mapred/mapred-site.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 2 +- .../ACCUMULO/configuration/accumulo-log4j.xml | 14 +- .../GLUSTERFS/configuration/core-site.xml | 34 +- .../GLUSTERFS/configuration/hadoop-env.xml | 20 +- .../services/HBASE/configuration/hbase-site.xml | 78 ++--- .../services/HIVE/configuration/hive-site.xml | 106 +++---- .../HIVE/configuration/webhcat-site.xml | 36 +-- .../services/OOZIE/configuration/oozie-site.xml | 62 ++-- .../services/TEZ/configuration/tez-site.xml | 12 +- .../YARN/configuration-mapred/mapred-site.xml | 22 +- .../YARN/configuration/capacity-scheduler.xml | 6 +- .../services/YARN/configuration/yarn-site.xml | 108 +++---- .../ACCUMULO/configuration/accumulo-env.xml | 2 +- .../ACCUMULO/configuration/accumulo-log4j.xml | 14 +- .../ACCUMULO/configuration/accumulo-site.xml | 2 +- .../FALCON/configuration/falcon-env.xml | 2 +- .../configuration/falcon-startup.properties.xml | 2 +- .../services/HBASE/configuration/hbase-env.xml | 2 +- .../services/HBASE/configuration/hbase-site.xml | 12 +- .../HBASE/configuration/ranger-hbase-audit.xml | 32 +- .../ranger-hbase-plugin-properties.xml | 52 ++-- .../ranger-hbase-policymgr-ssl.xml | 12 +- .../configuration/ranger-hbase-security.xml | 14 +- .../services/HDFS/configuration/hadoop-env.xml | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 8 +- .../HDFS/configuration/ranger-hdfs-audit.xml | 32 +- .../ranger-hdfs-plugin-properties.xml | 50 +-- .../configuration/ranger-hdfs-policymgr-ssl.xml | 12 +- .../HDFS/configuration/ranger-hdfs-security.xml | 14 +- .../services/HIVE/configuration/hive-env.xml | 2 +- .../services/HIVE/configuration/hive-site.xml | 8 +- .../HIVE/configuration/ranger-hive-audit.xml | 32 +- .../ranger-hive-plugin-properties.xml | 52 ++-- .../configuration/ranger-hive-policymgr-ssl.xml | 12 +- .../HIVE/configuration/ranger-hive-security.xml | 14 +- .../HIVE/configuration/webhcat-site.xml | 4 +- .../ranger-kafka-policymgr-ssl.xml | 4 +- .../KNOX/configuration/knoxsso-topology.xml | 2 +- .../KNOX/configuration/ranger-knox-audit.xml | 32 +- .../ranger-knox-plugin-properties.xml | 50 +-- .../configuration/ranger-knox-policymgr-ssl.xml | 12 +- .../KNOX/configuration/ranger-knox-security.xml | 12 +- .../services/OOZIE/configuration/oozie-env.xml | 2 +- .../PIG/configuration/pig-properties.xml | 2 +- .../RANGER/configuration/ranger-ugsync-site.xml | 8 +- .../configuration/ranger-kms-policymgr-ssl.xml | 4 +- .../ranger-storm-policymgr-ssl.xml | 4 +- .../configuration/ranger-storm-security.xml | 2 +- .../services/STORM/configuration/storm-site.xml | 8 +- .../2.3/services/TEZ/configuration/tez-site.xml | 18 +- .../YARN/configuration-mapred/mapred-site.xml | 6 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../YARN/configuration/ranger-yarn-audit.xml | 32 +- .../ranger-yarn-plugin-properties.xml | 12 +- .../configuration/ranger-yarn-policymgr-ssl.xml | 12 +- .../YARN/configuration/ranger-yarn-security.xml | 12 +- .../services/YARN/configuration/yarn-env.xml | 4 +- .../services/YARN/configuration/yarn-log4j.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 28 +- .../services/YARN/configuration/yarn-site.xml | 4 +- .../configuration/application-properties.xml | 52 ++-- .../services/ATLAS/configuration/atlas-env.xml | 22 +- .../configuration/falcon-startup.properties.xml | 14 +- .../services/HBASE/configuration/hbase-site.xml | 2 +- .../HBASE/configuration/ranger-hbase-audit.xml | 14 +- .../HDFS/configuration/ranger-hdfs-audit.xml | 14 +- .../HIVE/configuration/beeline-log4j2.xml | 2 +- .../services/HIVE/configuration/hive-env.xml | 2 +- .../HIVE/configuration/hive-exec-log4j2.xml | 2 +- .../HIVE/configuration/hive-interactive-env.xml | 22 +- .../configuration/hive-interactive-site.xml | 98 +++--- .../services/HIVE/configuration/hive-log4j2.xml | 2 +- .../services/HIVE/configuration/hive-site.xml | 4 +- .../HIVE/configuration/hivemetastore-site.xml | 8 +- .../HIVE/configuration/hiveserver2-site.xml | 8 +- .../HIVE/configuration/llap-cli-log4j2.xml | 2 +- .../HIVE/configuration/llap-daemon-log4j.xml | 2 +- .../HIVE/configuration/ranger-hive-audit.xml | 14 +- .../HIVE/configuration/tez-interactive-site.xml | 14 +- .../KAFKA/configuration/ranger-kafka-audit.xml | 14 +- .../KNOX/configuration/knoxsso-topology.xml | 2 +- .../KNOX/configuration/ranger-knox-audit.xml | 14 +- .../configuration/ranger-tagsync-site.xml | 4 +- .../RANGER/configuration/ranger-ugsync-site.xml | 10 +- .../RANGER_KMS/configuration/dbks-site.xml | 14 +- .../RANGER_KMS/configuration/kms-env.xml | 2 +- .../configuration/ranger-kms-audit.xml | 18 +- .../services/SPARK/configuration/livy-conf.xml | 8 +- .../services/SPARK/configuration/livy-env.xml | 12 +- .../configuration/livy-log4j-properties.xml | 2 +- .../configuration/livy-spark-blacklist.xml | 2 +- .../ranger-storm-policymgr-ssl.xml | 4 +- .../configuration/ranger-storm-security.xml | 2 +- .../services/STORM/configuration/storm-site.xml | 8 +- .../2.5/services/TEZ/configuration/tez-site.xml | 4 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../YARN/configuration/ranger-yarn-audit.xml | 14 +- .../services/YARN/configuration/yarn-site.xml | 8 +- .../ZEPPELIN/configuration/zeppelin-env.xml | 2 +- .../HDPWIN/2.1/configuration/cluster-env.xml | 16 +- .../AMBARI_METRICS/configuration/ams-env.xml | 12 +- .../configuration/ams-hbase-env.xml | 8 +- .../configuration/ams-hbase-site.xml | 4 +- .../AMBARI_METRICS/configuration/ams-log4j.xml | 2 +- .../AMBARI_METRICS/configuration/ams-site.xml | 2 +- .../FALCON/configuration/falcon-env.xml | 12 +- .../services/FLUME/configuration/flume-conf.xml | 2 +- .../services/FLUME/configuration/flume-env.xml | 2 +- .../services/HBASE/configuration/hbase-env.xml | 8 +- .../services/HBASE/configuration/hbase-site.xml | 4 +- .../services/HDFS/configuration/core-site.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 10 +- .../services/HDFS/configuration/hdfs-site.xml | 18 +- .../services/HIVE/configuration/hcat-env.xml | 2 +- .../services/HIVE/configuration/hive-env.xml | 22 +- .../services/HIVE/configuration/hive-site.xml | 82 ++--- .../services/HIVE/configuration/webhcat-env.xml | 2 +- .../HIVE/configuration/webhcat-site.xml | 14 +- .../services/OOZIE/configuration/oozie-env.xml | 12 +- .../services/OOZIE/configuration/oozie-site.xml | 10 +- .../services/SQOOP/configuration/sqoop-env.xml | 4 +- .../services/STORM/configuration/storm-env.xml | 8 +- .../services/STORM/configuration/storm-site.xml | 4 +- .../2.1/services/TEZ/configuration/tez-env.xml | 4 +- .../2.1/services/TEZ/configuration/tez-site.xml | 2 +- .../YARN/configuration-mapred/mapred-env.xml | 8 +- .../YARN/configuration-mapred/mapred-site.xml | 6 +- .../services/YARN/configuration/yarn-env.xml | 8 +- .../services/YARN/configuration/yarn-site.xml | 24 +- .../ZOOKEEPER/configuration/zoo.cfg.xml | 2 +- .../ZOOKEEPER/configuration/zookeeper-env.xml | 8 +- .../configuration/falcon-startup.properties.xml | 30 +- .../services/HBASE/configuration/hbase-env.xml | 2 +- .../services/HBASE/configuration/hbase-site.xml | 20 +- .../services/HDFS/configuration/core-site.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../services/HDFS/configuration/hdfs-log4j.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 2 +- .../services/HIVE/configuration/hive-env.xml | 12 +- .../services/HIVE/configuration/hive-site.xml | 312 +++++++++---------- .../HIVE/configuration/hiveserver2-site.xml | 6 +- .../HIVE/configuration/webhcat-site.xml | 24 +- .../KNOX/configuration/gateway-site.xml | 4 +- .../services/KNOX/configuration/knox-env.xml | 6 +- .../ranger-knox-plugin-properties.xml | 2 +- .../services/OOZIE/configuration/oozie-site.xml | 12 +- .../SLIDER/configurations/slider-client.xml | 2 +- .../services/STORM/configuration/storm-site.xml | 20 +- .../2.2/services/TEZ/configuration/tez-site.xml | 76 ++--- .../YARN/configuration-mapred/mapred-site.xml | 22 +- .../YARN/configuration/capacity-scheduler.xml | 10 +- .../services/YARN/configuration/yarn-env.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 112 +++---- .../configuration/falcon-startup.properties.xml | 2 +- .../services/HBASE/configuration/hbase-site.xml | 12 +- .../services/HDFS/configuration/hdfs-site.xml | 4 +- .../HIVE/configuration/webhcat-site.xml | 2 +- .../services/OOZIE/configuration/oozie-env.xml | 12 +- .../services/OOZIE/configuration/oozie-site.xml | 16 +- .../services/STORM/configuration/storm-site.xml | 12 +- .../2.3/services/TEZ/configuration/tez-site.xml | 16 +- .../YARN/configuration/capacity-scheduler.xml | 6 +- .../services/HDFS/configuration/core-site.xml | 10 +- .../services/HDFS/configuration/hdfs-site.xml | 24 +- .../0.11.0.2.0.5.0/configuration/hive-site.xml | 74 ++--- .../HIVE/configuration/hive-site.xml | 74 ++--- .../services/HDFS/configuration/hbase-site.xml | 30 +- .../services/HDFS/configuration/hdfs-site.xml | 94 +++--- .../MAPREDUCE/configuration/hbase-site.xml | 30 +- .../MAPREDUCE/configuration/hdfs-site.xml | 94 +++--- .../MAPREDUCE/configuration/mapred-site.xml | 94 +++--- .../YARN/configuration/capacity-scheduler.xml | 6 +- .../services/YARN/configuration/yarn-site.xml | 10 +- .../HBASE/1.0/configuration/hbase-site.xml | 30 +- .../HDFS/1.0/configuration/hbase-site.xml | 30 +- .../HDFS/1.0/configuration/hdfs-site.xml | 94 +++--- .../MAPREDUCE/1.0/configuration/hbase-site.xml | 30 +- .../MAPREDUCE/1.0/configuration/hdfs-site.xml | 94 +++--- .../MAPREDUCE/1.0/configuration/mapred-site.xml | 94 +++--- .../services/HDFS/configuration/hbase-site.xml | 30 +- .../services/HDFS/configuration/hdfs-site.xml | 94 +++--- .../MAPREDUCE/configuration/hbase-site.xml | 30 +- .../MAPREDUCE/configuration/hdfs-site.xml | 94 +++--- .../MAPREDUCE/configuration/mapred-site.xml | 94 +++--- .../services/HBASE/configuration/hbase-site.xml | 30 +- .../0.2/services/HDFS/configuration/global.xml | 48 +-- .../services/HDFS/configuration/hadoop-env.xml | 34 +- .../services/HDFS/configuration/hbase-site.xml | 30 +- .../services/HDFS/configuration/hdfs-log4j.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 94 +++--- .../services/MAPREDUCE/configuration/global.xml | 54 ++-- .../MAPREDUCE/configuration/hbase-site.xml | 30 +- .../MAPREDUCE/configuration/hdfs-site.xml | 94 +++--- .../MAPREDUCE/configuration/mapred-site.xml | 94 +++--- .../HBASE/configuration/hbase-policy.xml | 6 +- .../services/HBASE/configuration/hbase-site.xml | 68 ++-- .../services/HDFS/configuration/core-site.xml | 34 +- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-site.xml | 98 +++--- .../services/HIVE/configuration/hive-site.xml | 36 +-- .../configuration/capacity-scheduler.xml | 34 +- .../configuration/mapred-queue-acls.xml | 4 +- .../MAPREDUCE/configuration/mapred-site.xml | 146 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 52 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 32 +- .../services/GANGLIA/configuration/global.xml | 12 +- .../services/HBASE/configuration/global.xml | 60 ++-- .../HBASE/configuration/hbase-policy.xml | 6 +- .../services/HBASE/configuration/hbase-site.xml | 72 ++--- .../services/HCATALOG/configuration/global.xml | 8 +- .../services/HDFS/configuration/core-site.xml | 34 +- .../services/HDFS/configuration/global.xml | 70 ++--- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-site.xml | 100 +++--- .../services/HIVE/configuration/global.xml | 38 +-- .../services/HIVE/configuration/hive-site.xml | 66 ++-- .../1.3.0/services/HUE/configuration/global.xml | 4 +- .../services/HUE/configuration/hue-site.xml | 84 ++--- .../configuration/capacity-scheduler.xml | 34 +- .../services/MAPREDUCE/configuration/global.xml | 54 ++-- .../configuration/mapred-queue-acls.xml | 4 +- .../MAPREDUCE/configuration/mapred-site.xml | 146 ++++----- .../services/OOZIE/configuration/global.xml | 32 +- .../services/OOZIE/configuration/oozie-site.xml | 52 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 32 +- .../services/ZOOKEEPER/configuration/global.xml | 20 +- .../HBASE/configuration/hbase-policy.xml | 6 +- .../services/HBASE/configuration/hbase-site.xml | 66 ++-- .../services/HCFS/configuration/core-site.xml | 34 +- .../HCFS/configuration/hadoop-policy.xml | 22 +- .../services/HCFS/configuration/hdfs-site.xml | 98 +++--- .../services/HDFS/configuration/core-site.xml | 34 +- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-site.xml | 98 +++--- .../services/HIVE/configuration/hive-site.xml | 36 +-- .../configuration/capacity-scheduler.xml | 34 +- .../configuration/mapred-queue-acls.xml | 4 +- .../MAPREDUCE/configuration/mapred-site.xml | 144 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 52 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 32 +- .../services/HDFS/configuration/hdfs-log4j.xml | 2 +- .../HBASE/configuration/hbase-policy.xml | 6 +- .../services/HBASE/configuration/hbase-site.xml | 68 ++-- .../services/HDFS/configuration/core-site.xml | 34 +- .../services/HDFS/configuration/global.xml | 70 ++--- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-site.xml | 98 +++--- .../services/HIVE/configuration/hive-site.xml | 36 +-- .../MAPREDUCE2/configuration/global.xml | 8 +- .../configuration/mapred-queue-acls.xml | 4 +- .../MAPREDUCE2/configuration/mapred-site.xml | 80 ++--- .../services/OOZIE/configuration/oozie-site.xml | 52 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 32 +- .../YARN/configuration/capacity-scheduler.xml | 22 +- .../services/YARN/configuration/global.xml | 10 +- .../services/YARN/configuration/yarn-site.xml | 52 ++-- .../services/HBASE/configuration/global.xml | 60 ++-- .../HBASE/configuration/hbase-policy.xml | 6 +- .../services/HBASE/configuration/hbase-site.xml | 74 ++--- .../services/HDFS/configuration/core-site.xml | 30 +- .../services/HDFS/configuration/global.xml | 68 ++-- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-site.xml | 106 +++---- .../services/HIVE/configuration/hive-site.xml | 72 ++--- .../MAPREDUCE2/configuration/global.xml | 8 +- .../configuration/mapred-queue-acls.xml | 4 +- .../MAPREDUCE2/configuration/mapred-site.xml | 82 ++--- .../services/OOZIE/configuration/oozie-site.xml | 52 ++-- .../YARN/configuration/capacity-scheduler.xml | 22 +- .../services/YARN/configuration/global.xml | 16 +- .../services/YARN/configuration/yarn-site.xml | 68 ++-- .../services/ZOOKEEPER/configuration/global.xml | 20 +- .../ZOOKEEPER/configuration/zoo.cfg.xml | 14 +- .../services/FLUME/configuration/flume-conf.xml | 2 +- .../services/FLUME/configuration/flume-env.xml | 6 +- .../FLUME/configuration/flume-log4j.xml | 2 +- .../services/FLUME/configuration/flume-conf.xml | 2 +- .../services/FLUME/configuration/flume-env.xml | 6 +- .../FLUME/configuration/flume-log4j.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 18 +- .../services/HBASE/configuration/global.xml | 58 ++-- .../HBASE/configuration/hbase-policy.xml | 6 +- .../services/HBASE/configuration/hbase-site.xml | 72 ++--- .../services/HDFS/configuration/core-site.xml | 24 +- .../services/HDFS/configuration/global.xml | 70 ++--- .../HDFS/configuration/hadoop-policy.xml | 22 +- .../services/HDFS/configuration/hdfs-site.xml | 118 +++---- .../services/HIVE/configuration/hive-site.xml | 74 ++--- .../services/YARN/configuration/yarn-site.xml | 10 +- .../services/HBASE/configuration/hbase-site.xml | 72 ++--- .../services/HDFS/configuration/hdfs-site.xml | 6 +- .../PIG/configuration/pig-properties.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 6 +- .../0.2/services/HDFS/configuration/global.xml | 48 +-- .../services/HDFS/configuration/hadoop-env.xml | 34 +- .../services/HDFS/configuration/hbase-site.xml | 30 +- .../services/HDFS/configuration/hdfs-log4j.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 94 +++--- .../services/HDFS/configuration/hdfs-site.xml | 6 +- 585 files changed, 8140 insertions(+), 8143 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml index 4714fb3..1d330dd 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml @@ -32,7 +32,7 @@ <type>password</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property require-input="true"> <name>instance_secret</name> @@ -47,7 +47,7 @@ <editable-only-at-install>true</editable-only-at-install> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property require-input="false"> <name>trace_password</name> @@ -61,7 +61,7 @@ <type>password</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_log_dir</name> @@ -72,7 +72,7 @@ <type>directory</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_pid_dir</name> @@ -84,7 +84,7 @@ <editable-only-at-install>true</editable-only-at-install> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_instance_name</name> @@ -95,7 +95,7 @@ <editable-only-at-install>true</editable-only-at-install> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_user</name> @@ -107,7 +107,7 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_master_heapsize</name> @@ -119,7 +119,7 @@ <unit>MB</unit> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_tserver_heapsize</name> @@ -130,7 +130,7 @@ <type>int</type> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_monitor_heapsize</name> @@ -142,7 +142,7 @@ <unit>MB</unit> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_gc_heapsize</name> @@ -154,7 +154,7 @@ <unit>MB</unit> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_other_heapsize</name> @@ -165,7 +165,7 @@ <type>int</type> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_monitor_bind_all</name> @@ -175,17 +175,17 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_user_keytab</name> <description>Accumulo keytab path</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>accumulo_principal_name</name> <description>Accumulo principal name</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>content</name> @@ -211,7 +211,7 @@ export ACCUMULO_KILL_CMD='kill -9 %p' <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>server_content</name> @@ -239,6 +239,6 @@ export ACCUMULO_KILL_CMD='kill -9 %p' <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml index a8a6044..4337cde 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml @@ -24,38 +24,38 @@ <name>audit_log_level</name> <value>OFF</value> <description>Log level for audit logging</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>monitor_forwarding_log_level</name> <value>WARN</value> <description>Log level for logging forwarded to the Accumulo Monitor</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>debug_log_size</name> <value>512M</value> <description>Size of each debug rolling log file</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>debug_num_logs</name> <value>10</value> <description>Number of rolling debug log files to keep</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>info_log_size</name> <value>512M</value> <description>Size of each info rolling log file</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>info_num_logs</name> <value>10</value> <description>Number of rolling info log files to keep</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>content</name> @@ -110,6 +110,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml index a2d3f65..6793e4e 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml @@ -27,7 +27,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>instance.zookeeper.host</name> @@ -38,7 +38,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>instance.zookeeper.timeout</name> @@ -47,7 +47,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tserver.memory.maps.max</name> @@ -57,7 +57,7 @@ (tserver.memory.maps.native.enabled) this memory is off-heap. Ensure that table.compaction.minor.logs.threshold * tserver.walog.max.size >= tserver.memory.maps.max.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tserver.memory.maps.native.enabled</name> @@ -68,32 +68,32 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tserver.cache.data.size</name> <value>128M</value> <description>Size of on-heap block cache for data blocks.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tserver.cache.index.size</name> <value>256M</value> <description>Size of on-heap block cache for index blocks.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tserver.sort.buffer.size</name> <value>200M</value> <description>Amount of memory to use for sorting walogs when recovering from tserver failure.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tserver.walog.max.size</name> <value>1G</value> <description>Maximum size of each write-ahead log.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>master.port.client</name> @@ -102,7 +102,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>trace.port.client</name> @@ -112,7 +112,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tserver.port.client</name> @@ -121,7 +121,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>gc.port.client</name> @@ -131,7 +131,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>monitor.port.client</name> @@ -140,7 +140,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>monitor.port.log4j</name> @@ -150,7 +150,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>trace.user</name> @@ -161,7 +161,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>general.classpaths</name> @@ -187,6 +187,6 @@ $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml index a5104b0..681726f 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml @@ -28,7 +28,7 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_collector_log_dir</name> @@ -38,7 +38,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_collector_pid_dir</name> @@ -48,7 +48,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_monitor_pid_dir</name> @@ -58,7 +58,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_monitor_log_dir</name> @@ -68,7 +68,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_collector_heapsize</name> @@ -78,7 +78,7 @@ <type>int</type> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>content</name> @@ -133,6 +133,6 @@ export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS" <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml index 358403d..eaafc6b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml @@ -23,21 +23,21 @@ <value>/var/log/ambari-metrics-grafana</value> <display-name>Metrics Grafana log dir</display-name> <description>Metrics Grafana log directory.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_grafana_pid_dir</name> <value>/var/run/ambari-metrics-grafana</value> <display-name>Metrics Grafana pid dir</display-name> <description>Metrics Grafana pid directory.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_grafana_data_dir</name> <value>/var/lib/ambari-metrics-grafana</value> <display-name>Metrics Grafana data dir</display-name> <description>Metrics Grafana data directory.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_grafana_username</name> @@ -52,7 +52,7 @@ <type>db_user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property require-input="true"> <name>metrics_grafana_password</name> @@ -68,7 +68,7 @@ <overridable>false</overridable> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>content</name> @@ -88,6 +88,6 @@ export AMS_GRAFANA_LOG_DIR={{ams_grafana_log_dir}} # AMS UI Server PID Dir export AMS_GRAFANA_PID_DIR={{ams_grafana_pid_dir}} </value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml index 66b9de3..da4599e 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml @@ -22,25 +22,25 @@ <name>port</name> <value>3000</value> <description>The http port to use</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>protocol</name> <value>http</value> <description>Protocol (http or https)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>cert_file</name> <value>/etc/ambari-metrics-grafana/conf/ams-grafana.crt</value> <description>Path to grafana certificate (.crt) file.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>cert_key</name> <value>/etc/ambari-metrics-grafana/conf/ams-grafana.key</value> <description>Path to grafana certificate key (.key) file.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>content</name> @@ -304,6 +304,6 @@ org_name = Main Org. ;path = /var/lib/grafana/dashboards path = /usr/lib/ambari-metrics-grafana/public/dashboards </value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml index eaff9c2..b40923a 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml @@ -33,7 +33,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_pid_dir</name> @@ -42,7 +42,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_classpath_additional</name> @@ -51,7 +51,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_regionserver_heapsize</name> @@ -74,7 +74,7 @@ <name>hbase.rootdir</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>regionserver_xmn_size</name> @@ -90,7 +90,7 @@ <name>hbase.cluster.distributed</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_master_xmn_size</name> @@ -108,7 +108,7 @@ <name>hbase.cluster.distributed</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_master_maxperm_size</name> @@ -118,13 +118,13 @@ <type>int</type> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_master_heapsize</name> @@ -147,7 +147,7 @@ <name>hbase.rootdir</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>max_open_files_limit</name> @@ -155,7 +155,7 @@ <description> The maximum number of open file descriptors by process </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <!-- hbase-env.sh --> <property> @@ -257,6 +257,6 @@ export HBASE_HOME={{ams_hbase_home_dir}} <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml index 5b1a2ff..08c7b94 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml @@ -141,6 +141,6 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml index 7892703..a7045bb 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml @@ -28,7 +28,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>security.admin.protocol.acl</name> @@ -38,7 +38,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>security.masterregion.protocol.acl</name> @@ -48,6 +48,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml index b55f481..2be101b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml @@ -26,7 +26,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ams.zookeeper.principal</name> @@ -34,7 +34,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hadoop.security.authentication</name> @@ -42,7 +42,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.coprocessor.master.classes</name> @@ -50,7 +50,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.coprocessor.region.classes</name> @@ -58,7 +58,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.master.kerberos.principal</name> @@ -66,7 +66,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.master.keytab.file</name> @@ -74,7 +74,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.myclient.keytab</name> @@ -82,7 +82,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.myclient.principal</name> @@ -90,7 +90,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.kerberos.principal</name> @@ -98,7 +98,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.keytab.file</name> @@ -106,7 +106,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.security.authentication</name> @@ -114,7 +114,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.security.authorization</name> @@ -122,7 +122,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.authProvider.1</name> @@ -130,7 +130,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.jaasLoginRenew</name> @@ -138,7 +138,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name> @@ -146,7 +146,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name> @@ -154,6 +154,6 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml index ba86f900..f4e5fb2 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml @@ -39,7 +39,7 @@ <name>timeline.metrics.service.operation.mode</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.tmp.dir</name> @@ -53,14 +53,14 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.cluster.distributed</name> @@ -76,7 +76,7 @@ <name>timeline.metrics.service.operation.mode</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.master.wait.on.regionservers.mintostart</name> @@ -84,7 +84,7 @@ <description> Ensure that HBase Master waits for # many region server to start. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.quorum</name> @@ -97,37 +97,37 @@ this is the list of servers which we will start/stop ZooKeeper on. </description> <final>true</final> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.hregion.majorcompaction</name> @@ -137,7 +137,7 @@ HStoreFiles in a region. 0 to disable automated major compactions. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.query.spoolThresholdBytes</name> @@ -146,7 +146,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.dataDir</name> @@ -155,7 +155,7 @@ Property from ZooKeeper's config zoo.cfg. The directory where the snapshot is stored. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.client.scanner.caching</name> @@ -164,20 +164,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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.master.normalizer.class</name> @@ -187,7 +187,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hfile.block.cache.size</name> @@ -196,7 +196,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.global.memstore.upperLimit</name> @@ -205,7 +205,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.global.memstore.lowerLimit</name> @@ -217,7 +217,7 @@ the minimum possible flushing to occur when updates are blocked due to memstore limiting. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.groupby.maxCacheSize</name> @@ -225,7 +225,7 @@ <description> Size in bytes of pages cached during GROUP BY spilling. Default is 100Mb. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.hregion.max.filesize</name> @@ -234,7 +234,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.hregion.memstore.block.multiplier</name> @@ -244,7 +244,7 @@ times hbase.hregion.memstore.flush.size bytes. Useful preventing runaway memstore during spikes in update traffic. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.hstore.flusher.count</name> @@ -254,7 +254,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.query.timeoutMs</name> @@ -263,7 +263,7 @@ Number of milliseconds after which a query will timeout on the client. Default is 5 min. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.query.keepAliveMs</name> @@ -272,7 +272,7 @@ Number of milliseconds after which a query will keep the connection to HBase alive. Default is 5 min. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.client.scanner.timeout.period</name> @@ -280,7 +280,7 @@ <description> Client scanner lease period in milliseconds. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.rpc.timeout</name> @@ -291,7 +291,7 @@ but will eventually throw a TimeoutException. </description> <display-name>HBase RPC Timeout</display-name> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.thread.compaction.large</name> @@ -299,7 +299,7 @@ <description> Configuration key for the large compaction threads. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.regionserver.thread.compaction.small</name> @@ -307,7 +307,7 @@ <description> Configuration key for the small compaction threads. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.clientPort</name> @@ -322,17 +322,17 @@ <name>hbase.cluster.distributed</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.peerport</name> <value>61288</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.leaderport</name> <value>61388</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.hstore.blockingStoreFiles</name> @@ -343,7 +343,7 @@ this region until a compaction is completed, or until hbase.hstore.blockingWaitTime has been exceeded. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.hregion.memstore.flush.size</name> @@ -353,19 +353,19 @@ number of bytes. Value is checked by a thread that runs every hbase.server.thread.wakefrequency. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.zookeeper.property.tickTime</name> @@ -375,13 +375,13 @@ ZooKeeper, as measured in milliseconds. This property setting only affects the ZK server started by AMS in embedded mode. Unit = ms. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>zookeeper.session.timeout.localHBaseCluster</name> @@ -390,7 +390,7 @@ ZooKeeper session timeout in milliseconds for pseudo distributed mode. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.sequence.saltBuckets</name> @@ -398,7 +398,7 @@ <description> Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.query.maxGlobalMemoryPercentage</name> @@ -407,7 +407,7 @@ Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory()) that all threads may use. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.spool.directory</name> @@ -416,7 +416,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.mutate.batchSize</name> @@ -426,7 +426,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.query.rowKeyOrderSaltedTable</name> @@ -437,7 +437,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.coprocessor.maxServerCacheTimeToLiveMs</name> @@ -450,7 +450,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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>phoenix.coprocessor.maxMetaDataCacheSize</name> @@ -460,7 +460,7 @@ evictions will begin to occur based on least recent access time. Default is 20Mb </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.client.read.shortcircuit</name> @@ -479,11 +479,11 @@ <name>hbase.rootdir</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>zookeeper.znode.parent</name> <value>/ams-hbase-unsecure</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml index 21f80b6..81f6dbc 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml @@ -60,6 +60,6 @@ log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration>
