----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/38388/#review99017 -----------------------------------------------------------
Overall, looking good. A few nits. Also, you need some downgrade tests too. ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java (lines 662 - 664) <https://reviews.apache.org/r/38388/#comment155828> There must be a better way to do this. This logic should be in the UpgradeHelper logic somewhere, or maybe make a group specifically for this, instead of relying on name. ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java (line 42) <https://reviews.apache.org/r/38388/#comment155829> Or make a special grouping class that will encapsulate this, and not use name at all. ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml (lines 176 - 181) <https://reviews.apache.org/r/38388/#comment155830> You will have to check a downgrade to make sure this would be executed at the same place you think it would. - Nate Cole On Sept. 14, 2015, 10:53 p.m., Alejandro Fernandez wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/38388/ > ----------------------------------------------------------- > > (Updated Sept. 14, 2015, 10:53 p.m.) > > > Review request for Ambari, Dmytro Grinenko, Dmitro Lisnichenko, Jonathan > Hurley, and Nate Cole. > > > Bugs: AMBARI-13052 > https://issues.apache.org/jira/browse/AMBARI-13052 > > > Repository: ambari > > > Description > ------- > > For a Stop-and-Start Upgrade from HDP 2.1 -> 2.3, we need to stop all > services using the scripts for HDP 2.1, and then start them using HDP 2.3. > > Today, during an Upgrade, we currently set the desired stack id when we > process Upgrade Pack and insert the upgrade record. That means that all > start/stop commands use the scripts from the desired stack. > > Instead, we need a Server Side Action to be called right before we run > "hdp-select set all" that will change the desired stack id to the new > version; this will permit stopping on the old version, and starting on the > new version. > > When we downgrade, we commence the orchestration again, and we again call the > Server Side Action to change the desired stack id, this time to the starting > version. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java > 6ac3ed7 > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java > a7f206a > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java > 6133885 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > c73f9d4 > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java > PRE-CREATION > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java > d86210a > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java > ec0fabf > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerActionTask.java > ea59d65 > > ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml > c55e1a8 > > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml > 01022b8 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java > 6708422 > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java > 1f27cb3 > > Diff: https://reviews.apache.org/r/38388/diff/ > > > Testing > ------- > > Verified it worked during a Stop-the-World Upgrade. > Unit tests passed. > > > Thanks, > > Alejandro Fernandez > >