----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/62414/#review185717 -----------------------------------------------------------
Ship it! Ship It! ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java Lines 1091-1092 (original), 1095-1099 (patched) <https://reviews.apache.org/r/62414/#comment262027> Only if you are making other changes, this can be simplified: ``` Set<String> readOnlyPropertiesForType = readOnlyProperties.get(configurationType); boolean readOnly = (null != readOnlyPropertiesForType && readOnlyPropertiesForType.contains(existingConfigurationKey)); ``` ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java Lines 1176 (patched) <https://reviews.apache.org/r/62414/#comment262028> Unless this would be used for something else, wouldn't it be simpler if this method returned a boolean value rather than a Set? You could then potentially save some time by not having to visit all of the properties - Robert Levas On Sept. 19, 2017, 1:38 p.m., Jonathan Hurley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/62414/ > ----------------------------------------------------------- > > (Updated Sept. 19, 2017, 1:38 p.m.) > > > Review request for Ambari, Nate Cole and Robert Levas. > > > Bugs: AMBARI-21999 > https://issues.apache.org/jira/browse/AMBARI-21999 > > > Repository: ambari > > > Description > ------- > > STR: > - Install a stack, such as HDP 2.3 > - Modify the {{cluster-env/stack_features}} structure > - Upgrade to HDP 2.6 > > The auto-merge which happens can't properly merge > {{cluster-env/stack_features}} since it has deviated from the stock values of > HDP 2.3. This is dangerous since this is needed for proper operation. > > Because it's defined as a read-only value, we should be able to detect this > in the auto-merge fro the upgrade and force it to the new stack's default > value... > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java > 9aa9e31a21 > > > Diff: https://reviews.apache.org/r/62414/diff/1/ > > > Testing > ------- > > PENDING... > > > Thanks, > > Jonathan Hurley > >