-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/60810/
-----------------------------------------------------------
(Updated July 12, 2017, 2:36 p.m.)
Review request for Ambari, Alejandro Fernandez, Nate Cole, and Sid Wagle.
Bugs: AMBARI-21451
https://issues.apache.org/jira/browse/AMBARI-21451
Repository: ambari
Description
-------
The fix here is to use the RepositoryVersion to populate the correct values in
the commands - much of the Python code was still using propeties which were
removed because they were no longer necessary. I could have also changed Python
to stop using downgrade_from_version, but that change was massive and it was
much simpler to re-add it.
*STR*
# Deployed cluster with Ambari version: 2.4.3.0-30 and HDP version: 2.5.5.0-157
# Upgrade Ambari to 2.5.2.0-114 | hash: d2ee45733e0c63d589f535866e6584b42d91126e
# Start EU to 2.6.2.0-79 and reach till Finalize
# Downgrade back to 2.5
*Result*
Observed errors at Livy and Spark client restarts:
{code}
Traceback (most recent call last):
File
"/var/lib/ambari-agent/cache/common-services/SPARK/1.2.1/package/scripts/spark_client.py",
line 88, in <module>
SparkClient().execute()
File
"/usr/lib/python2.6/site-packages/resource_management/libraries/script/script.py",
line 329, in execute
method(env)
File
"/usr/lib/python2.6/site-packages/resource_management/libraries/script/script.py",
line 806, in restart
self.pre_upgrade_restart(env, upgrade_type=upgrade_type)
File
"/var/lib/ambari-agent/cache/common-services/SPARK/1.2.1/package/scripts/spark_client.py",
line 79, in pre_upgrade_restart
import params
File
"/var/lib/ambari-agent/cache/common-services/SPARK/1.2.1/package/scripts/params.py",
line 62, in <module>
stack_version_unformatted =
config['commandParams']['original_stack'].split("-")[1]
File
"/usr/lib/python2.6/site-packages/resource_management/libraries/script/config_dictionary.py",
line 73, in __getattr__
raise Fail("Configuration parameter '" + self.name + "' was not found in
configurations dictionary!")
resource_management.core.exceptions.Fail: Configuration parameter
'original_stack' was not found in configurations dictionary!
{code}
Diffs
-----
ambari-common/src/main/python/resource_management/libraries/functions/stack_features.py
7811e269c8
ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
28946e728e
ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
32fb37bc1e
ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java
c36109442d
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
f75fb41a44
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
9ea6083939
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
113002606c
ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
0e6f0c4fec
ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptor.java
60d02a31d3
ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
b97dc809b4
ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
b54b565e86
ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
47d2a81a96
ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
c9c0dd0cf2
ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java
6b8062347b
ambari-server/src/test/python/TestStackFeature.py 0116a7a4ad
ambari-server/src/test/python/custom_actions/test_ru_set_all.py e1a89a8999
ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json 7f77d837f2
ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json
87b18af1d7
ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json
99fcba002d
ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json a9db11c645
Diff: https://reviews.apache.org/r/60810/diff/1/
Testing (updated)
-------
These are existing failures on trunk. I tested upgrade/downgrade paths between
stack names and versions.
----------------------------------------------------------------------
Total run:1161
Total errors:12
Total failures:0
ERROR
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 55.449 s
[INFO] Finished at: 2017-07-12T14:16:03-04:00
[INFO] Final Memory: 18M/309M
[INFO] ------------------------------------------------------------------------
Thanks,
Jonathan Hurley