> On Feb. 3, 2015, 9:12 a.m., Tom Beerbower wrote: > > ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java, > > lines 196-201 > > <https://reviews.apache.org/r/30533/diff/1/?file=844676#file844676line196> > > > > The doc says 'the modified hosts instance, or {@code null} if the > > filtering results in no hosts to upgrade'. > > > > If 'toUpgrade.isEmpty()' should you return null?
The logic had to change for a bit, whereas the toUpgrade.isEmpty() could be true, but unhealthy has items. Will update the doc. - Nate ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/30533/#review70750 ----------------------------------------------------------- On Feb. 2, 2015, 7:14 p.m., Nate Cole wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/30533/ > ----------------------------------------------------------- > > (Updated Feb. 2, 2015, 7:14 p.m.) > > > Review request for Ambari, Jonathan Hurley and Tom Beerbower. > > > Bugs: AMBARI-9436 > https://issues.apache.org/jira/browse/AMBARI-9436 > > > Repository: ambari > > > Description > ------- > > * Added special task that only gets invoked when there hosts that don't > heartbeat > * Added structured_out to the manual task action > * Fixed ZK client to go with other clients (small change 'while I was in > there') > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/controller/ActionExecutionContext.java > 89f7307 > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java > b8f3cd7 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > 28538c0 > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ManualStageAction.java > 5f49ace > ambari-server/src/main/java/org/apache/ambari/server/stack/HostsType.java > 601ee4b > > ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java > 239c79c > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java > c0514c5 > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java > a3f747b > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java > 8e2100c > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ManualTask.java > d411dea > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml > 5bb8dd6 > > ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java > 33d74af > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml > d1bbca1 > > Diff: https://reviews.apache.org/r/30533/diff/ > > > Testing > ------- > > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 18:47.643s > [INFO] Finished at: Mon Feb 02 18:55:22 EST 2015 > [INFO] Final Memory: 32M/345M > [INFO] > ------------------------------------------------------------------------ > > > Thanks, > > Nate Cole > >