----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/47421/#review133407 -----------------------------------------------------------
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java (line 854) <https://reviews.apache.org/r/47421/#comment197821> Centralized this behavior so that unit tests could use it as well. ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java (lines 1739 - 1761) <https://reviews.apache.org/r/47421/#comment197822> Bulk of the changed logic is here. Basically start out with the source stack (HDP 2.2 and merge in any defined "intermediate" configs) ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml <https://reviews.apache.org/r/47421/#comment197823> Intermediate should mean "in between". In this case, on a HDP 2.1 to 2.3 upgrade, 2.2 is the only one "in between" ... ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml (line 1183) <https://reviews.apache.org/r/47421/#comment197824> Wow ... just ... wow - Jonathan Hurley On May 16, 2016, 2:50 p.m., Jonathan Hurley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/47421/ > ----------------------------------------------------------- > > (Updated May 16, 2016, 2:50 p.m.) > > > Review request for Ambari, Alejandro Fernandez, Dmitro Lisnichenko, Jayush > Luniya, and Nate Cole. > > > Bugs: AMBARI-16687 > https://issues.apache.org/jira/browse/AMBARI-16687 > > > Repository: ambari > > > Description > ------- > > During an upgrade from HDP 2.x to 2.y, all of the configuration tasks are > being shown as skipped. This is due to AMBARI-15222 where the configuration > packs were being calculated incorrectly resulting in empty maps. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > b069862 > > ambari-server/src/main/java/org/apache/ambari/server/stack/StackDefinitionDirectory.java > f2e00fe > > ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml > 564b5bd > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml > 257893f > > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml > 1fa4d00 > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml > bf041de > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml > 45e2f94 > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml > 7873853 > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml > 1cd2ffa > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml > f71ef1a > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml > 9c6a02d > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml > a7dbba3 > > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml > 2e5c002 > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml > 1745de8 > > ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java > 771f830 > > ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java > PRE-CREATION > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml > cb034d0 > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml > 623b45c > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml > 4932e92 > > Diff: https://reviews.apache.org/r/47421/diff/ > > > Testing > ------- > > Wrote a new unit test which validates all upgrade XML files which have > configuration tasks. > > > Thanks, > > Jonathan Hurley > >
