> On Oct. 14, 2015, 12:38 p.m., Nate Cole wrote: > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java, > > line 225 > > <https://reviews.apache.org/r/39306/diff/2/?file=1097966#file1097966line225> > > > > Use StringUtils.isEmpty() here
Will fix > On Oct. 14, 2015, 12:38 p.m., Nate Cole wrote: > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java, > > line 229 > > <https://reviews.apache.org/r/39306/diff/2/?file=1097966#file1097966line229> > > > > Just shortcut the return above. There's a lot of nested > > null-check-on-pack in this method. Shortcutting will clean it up > > significantly. Will fix - Alejandro ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/39306/#review102610 ----------------------------------------------------------- On Oct. 14, 2015, 2:42 a.m., Alejandro Fernandez wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/39306/ > ----------------------------------------------------------- > > (Updated Oct. 14, 2015, 2:42 a.m.) > > > Review request for Ambari, Dmytro Grinenko, Dmitro Lisnichenko, Jonathan > Hurley, and Nate Cole. > > > Bugs: AMBARI-13418 > https://issues.apache.org/jira/browse/AMBARI-13418 > > > Repository: ambari > > > Description > ------- > > Rolling Upgrade and Express Upgrade cannot be started because it cannot find > the correct upgrade pack to use based on the type. > The PreChecks endpoint needs to resolve to the same upgrade pack. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java > 93093d2 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > bf7647e > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java > f0b383c > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java > 066c0e6 > > ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java > 483a024 > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml > 827348a > > Diff: https://reviews.apache.org/r/39306/diff/ > > > Testing > ------- > > Tested this on Ambari 2.1.3 using branch-2.1 and > 1. HDP 2.1 can report a failure during the NON_ROLLING PreCheck if masters > are down. > 2. HDP 2.1->2.3 can pass the prechecks and start Express Upgrade > 3. HDP 2.2 can report a failure during the ROLLING PreCheck if masters are > down. > 4. HDP 2.2->2.3 can pass the prechecks and start Rolling Upgrade > > > For the Pre-Checks, tested using these endpoints, > * > http://server.:8080/api/v1/clusters/c1/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version=2.3.2.0-2950&UpgradeChecks/upgrade_type=ROLLING > * > http://server.:8080/api/v1/clusters/c1/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version=2.3.2.0-2950&UpgradeChecks/upgrade_type=NON_ROLLING > > > I tagged some of the unit tests with Ignore since they were failing in an > unrelated area due to the setup. > > > Thanks, > > Alejandro Fernandez > >
