----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/61317/#review181928 -----------------------------------------------------------
ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java Lines 147-149 (patched) <https://reviews.apache.org/r/61317/#comment257750> Since this code was taken from trunk (where there is no stack ID of a cluster anymore), we needed to add this back into the branch-2.6 line... This allows the configurations created during upgrade to be associated with the correct stack. ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java Lines 1241-1242 (patched) <https://reviews.apache.org/r/61317/#comment257752> Not sure what happened here with the backport, but this method was missing actually populating the default config types. Without this statement, we ended up with maps that looked like: hdfs-site = {}, yarn-env = {}, etc This caused empty configuration types to be created on upgrade. ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java Lines 893-896 (original), 893-896 (patched) <https://reviews.apache.org/r/61317/#comment257753> This needs to also go into trunk, as the bug exists there too - we have to undo the configurations for _every_ service - we should not be returning here, but continuing. - Jonathan Hurley On Aug. 1, 2017, 8:32 p.m., Jonathan Hurley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/61317/ > ----------------------------------------------------------- > > (Updated Aug. 1, 2017, 8:32 p.m.) > > > Review request for Ambari, Alejandro Fernandez, Dmytro Grinenko, Dmitro > Lisnichenko, and Nate Cole. > > > Bugs: AMBARI-21626 > https://issues.apache.org/jira/browse/AMBARI-21626 > > > Repository: ambari > > > Description > ------- > > During an upgrade from HDP 2.5 to HDP 2.6, the new configurations are not > created in HDP 2.6 - they're created in HDP 2.5 which causes services to fail > on restart. > > STR: > - Create an HDP 2.5 cluster with ZK + HDFS > - Do an EU to HDP 2.6 > > The EU will fail right after the "move stack version" step. > > It looks like the bug is in {{ConfigHelper}} where it ignores the passed-in > {{StackId}} and uses the Cluster's stack. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java > ff0becc822 > > ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java > 16fc971e27 > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java > a5b40ff256 > > > Diff: https://reviews.apache.org/r/61317/diff/1/ > > > Testing > ------- > > Full upgrade/downgrade > > UTs PENDING... > > > Thanks, > > Jonathan Hurley > >
