Repository: ambari Updated Branches: refs/heads/branch-2.6 41a1bc81b -> 9e0a7fbe2
AMBARI-21568. Pig service check fails after upgrade Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ed75d7d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ed75d7d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ed75d7d Branch: refs/heads/branch-2.6 Commit: 2ed75d7de21837826a2c5c6df68221a4644f8998 Parents: 41a1bc8 Author: Attila Doroszlai <[email protected]> Authored: Tue Jul 25 08:28:05 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Thu Jul 27 15:23:47 2017 +0200 ---------------------------------------------------------------------- .../PIG/0.12.0.2.0/package/scripts/params_linux.py | 1 + .../PIG/0.12.0.2.0/package/scripts/service_check.py | 2 +- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 +++++++++++ .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 +++++ .../stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 11 +++++++++++ .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 +++++ 6 files changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2ed75d7d/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py index 5af1274..2c773ec 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py @@ -40,6 +40,7 @@ stack_root = Script.get_stack_root() stack_version_unformatted = config['hostLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) +has_tez = 'tez-site' in config['configurations'] # New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade version = default("/commandParams/version", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/2ed75d7d/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/service_check.py index ba4082e..0b15603 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/service_check.py @@ -92,7 +92,7 @@ class PigServiceCheckLinux(PigServiceCheck): bin_dir = params.hadoop_bin_dir ) - if params.stack_version_formatted and check_stack_feature(StackFeature.PIG_ON_TEZ, params.stack_version_formatted): + if params.has_tez and params.stack_version_formatted and check_stack_feature(StackFeature.PIG_ON_TEZ, params.stack_version_formatted): # cleanup results from previous test params.HdfsResource(output_dir, type="directory", http://git-wip-us.apache.org/repos/asf/ambari/blob/2ed75d7d/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index 2e9bd65..f71e91a 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -81,6 +81,17 @@ </component> </service> + <service name="PIG"> + <component name="PIG"> + <changes> + <definition xsi:type="configure" id="biginsights_4_2_pig_exectype_change" summary="Update Pig configurations"> + <type>pig-properties</type> + <replace key="content" find="exectype=tez" replace-with="exectype=mapreduce"/> + </definition> + </changes> + </component> + </service> + <service name="HBASE"> <component name="HBASE_MASTER"> <changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/2ed75d7d/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 684acfa..9d3cc1e 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -239,6 +239,11 @@ <task xsi:type="configure" id="biginsights_4_2_mapreduce_application_framework_patch" /> </execute-stage> + <!-- PIG --> + <execute-stage service="PIG" component="PIG" title="Apply config changes for Pig"> + <task xsi:type="configure" id="biginsights_4_2_pig_exectype_change" /> + </execute-stage> + <!-- HBASE --> <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBase"> <task xsi:type="configure" id="biginsights_4_2_hbase_env_config" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/2ed75d7d/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index f79272f..a3b190f 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -173,6 +173,17 @@ </component> </service> + <service name="PIG"> + <component name="PIG"> + <changes> + <definition xsi:type="configure" id="biginsights_4_2_pig_exectype_change" summary="Update Pig configurations"> + <type>pig-properties</type> + <replace key="content" find="exectype=tez" replace-with="exectype=mapreduce"/> + </definition> + </changes> + </component> + </service> + <service name="HBASE"> <component name="HBASE_MASTER"> <changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/2ed75d7d/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 484e459..3637927 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -234,6 +234,11 @@ <task xsi:type="configure" id="biginsights_4_2_mapreduce_application_framework_patch" /> </execute-stage> + <!-- PIG --> + <execute-stage service="PIG" component="PIG" title="Apply config changes for Pig"> + <task xsi:type="configure" id="biginsights_4_2_pig_exectype_change" /> + </execute-stage> + <!-- HBASE --> <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBase"> <task xsi:type="configure" id="biginsights_4_2_hbase_env_config" />
