AMBARI-17564. Identify config changes added to Ambari-2.4.0 and mark them to not get added during Ambari upgrade (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7dfe394 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7dfe394 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7dfe394 Branch: refs/heads/branch-2.4 Commit: b7dfe3947ae29a2a6989492e05aaaf2e7e0b1916 Parents: e85fc59 Author: Lisnichenko Dmitro <[email protected]> Authored: Fri Jul 15 12:48:48 2016 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Fri Jul 15 12:50:05 2016 +0300 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml | 2 +- .../AMBARI_METRICS/0.1.0/configuration/storm-site.xml | 4 ++-- .../AMBARI_METRICS/0.1.0/package/scripts/params_linux.py | 4 ++-- .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 8 ++++---- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 4 ++-- .../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 2 +- .../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 4 ++-- .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 2 +- .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 2 +- .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 2 +- .../2.5/services/HIVE/configuration/tez-interactive-site.xml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/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 3ce1af2..80fd95c 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 @@ -170,7 +170,7 @@ The timeout is introduced because there is a known bug when from time to time HB <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- hbase-env.sh --> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml index 61b4233..b4350fc 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml @@ -33,7 +33,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>topology.metrics.consumer.register</name> @@ -42,6 +42,6 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py index 46752be..4ef719c 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py @@ -52,5 +52,5 @@ sudo = AMBARI_SUDO_BINARY dfs_type = default("/commandParams/dfs_type", "") -hbase_regionserver_shutdown_timeout = expect('/configurations/ams-hbase-env/hbase_regionserver_shutdown_timeout', int) - +hbase_regionserver_shutdown_timeout = expect('/configurations/ams-hbase-env/hbase_regionserver_shutdown_timeout', int, + 30) http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml index 8087204..74d8600 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml @@ -77,23 +77,23 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas_server_metadata_size</name> <value>50000</value> <description>Count of metadata objects that supposed to be processed by atlas instance</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas_server_xmx</name> <value>2048</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas_server_max_new_size</name> <value>614</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- metadata-env.sh --> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py index 0df8270..e14dfc7 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py @@ -216,8 +216,8 @@ has_ranger_admin = not len(ranger_admin_hosts) == 0 xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported'] enable_ranger_atlas = False -atlas_server_xmx = config['configurations']['atlas-env']['atlas_server_xmx'] -atlas_server_max_new_size = config['configurations']['atlas-env']['atlas_server_max_new_size'] +atlas_server_xmx = default("configurations/atlas-env/atlas_server_xmx", 2048) +atlas_server_max_new_size = default("configurations/atlas-env/atlas_server_max_new_size", 614) if has_ranger_admin and stack_supports_atlas_ranger_plugin: # for create_hdfs_directory http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 9811191..24bd563 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -152,7 +152,7 @@ The timeout is introduced because there is a known bug when from time to time HB <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- hbase-env.sh --> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py index 145c216..f5e0301 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py @@ -116,7 +116,7 @@ regionserver_xmn_max = config['configurations']['hbase-env']['hbase_regionserver regionserver_xmn_percent = expect("/configurations/hbase-env/hbase_regionserver_xmn_ratio", float) regionserver_xmn_size = calc_xmn_from_xms(regionserver_heapsize, regionserver_xmn_percent, regionserver_xmn_max) -hbase_regionserver_shutdown_timeout = expect('/configurations/hbase-env/hbase_regionserver_shutdown_timeout', int) +hbase_regionserver_shutdown_timeout = expect('/configurations/hbase-env/hbase_regionserver_shutdown_timeout', int, 30) phoenix_hosts = default('/clusterHostInfo/phoenix_query_server_hosts', []) phoenix_enabled = default('/configurations/hbase-env/phoenix_sql_enabled', False) @@ -394,4 +394,4 @@ if has_ranger_admin: create_hbase_home_directory = check_stack_feature(StackFeature.HBASE_HOME_DIRECTORY, stack_version_formatted) -hbase_home_directory = format("/user/{hbase_user}") \ No newline at end of file +hbase_home_directory = format("/user/{hbase_user}") http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml index 61437d5..003b8ec 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml @@ -212,7 +212,7 @@ limitations under the License. <name>hive.server2.max.start.attempts</name> <description>This number of times HiveServer2 will attempt to start before exiting, sleeping 60 seconds between retries.</description> <value>5</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>hive.server2.authentication</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml index d0e51eb..804c662 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml @@ -80,7 +80,7 @@ <type>directory</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>oozie_pid_dir</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py index 43059af..85085de 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py @@ -122,7 +122,7 @@ user_group = config['configurations']['cluster-env']['user_group'] jdk_location = config['hostLevelParams']['jdk_location'] check_db_connection_jar_name = "DBConnectionVerification.jar" check_db_connection_jar = format("/usr/lib/ambari-agent/{check_db_connection_jar_name}") -oozie_tmp_dir = config['configurations']['oozie-env']['oozie_tmp_dir'] +oozie_tmp_dir = default("configurations/oozie-env/oozie_tmp_dir", "/var/tmp/oozie") oozie_hdfs_user_dir = format("/user/{oozie_user}") oozie_pid_dir = status_params.oozie_pid_dir pid_file = status_params.pid_file http://git-wip-us.apache.org/repos/asf/ambari/blob/b7dfe394/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml index a503e95..9e588e9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml @@ -79,7 +79,7 @@ <property> <name>tez.dag.recovery.enabled</name> <value>false</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>tez.am.resource.memory.mb</name>
