----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/43944/#review120815 -----------------------------------------------------------
This is very close - I think there's just one more thing to do (below). ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java (lines 251 - 252) <https://reviews.apache.org/r/43944/#comment182315> This shouldn't be done here. ConfigureAction handles largely handles the transfer/set/replacement "property existence" (but will have to be modified for this patch). The "get allowed" should only be checking for invalid attributes like "if-value is present, but if-key is not" type of stuff. (If we had an XSD that would work better, but that's a much different JIRA :) ) Also, when going across stacks there may be directives against properties that ONLY come with the new stack but may not be there when this code is invoked (orchestration). ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java (lines 274 - 277) <https://reviews.apache.org/r/43944/#comment182316> See above - Nate Cole On Feb. 25, 2016, 4:34 p.m., Di Li wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/43944/ > ----------------------------------------------------------- > > (Updated Feb. 25, 2016, 4:34 p.m.) > > > Review request for Ambari, Alejandro Fernandez and Nate Cole. > > > Bugs: AMBARI-15132 > https://issues.apache.org/jira/browse/AMBARI-15132 > > > Repository: ambari > > > Description > ------- > > <condition> in upgrade.xml currently only supports single property set. this > is to improve it to to support set/replace/transfer. The code change must be > backward compatible in order to not break the existing update-**.xml and > nonrolling-upgrade-**.xml. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java > a4dff2e > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java > 6b22f58 > > ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java > 1a5d4e7 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml > f345d12 > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml > 237da77 > > Diff: https://reviews.apache.org/r/43944/diff/ > > > Testing > ------- > > unit test > ran upgrade from Ambari 2.2 to Ambari trunk. > > > Thanks, > > Di Li > >
