----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/40140/#review105894 -----------------------------------------------------------
Ship it! ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java (lines 824 - 825) <https://reviews.apache.org/r/40140/#comment164592> At this point we may as well just start passing around the UpgradeGroupHolder (named "group") object to all these various methods. Won't hold up the review for it. - Nate Cole On Nov. 10, 2015, 11:15 a.m., Jonathan Hurley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/40140/ > ----------------------------------------------------------- > > (Updated Nov. 10, 2015, 11:15 a.m.) > > > Review request for Ambari, Alejandro Fernandez, Jayush Luniya, and Nate Cole. > > > Bugs: AMBARI-13816 > https://issues.apache.org/jira/browse/AMBARI-13816 > > > Repository: ambari > > > Description > ------- > > The easiest solution here is to make a new group for the finalize action and > then make that group not skippable. However, that might not be a desirable > "feature" This step exists in a skippable group, which means it can be > automatically skipped > > {code} > <execute-stage title="Save Cluster State" service="" component=""> > <task xsi:type="server_action" > class="org.apache.ambari.server.serveraction.upgrades.FinalizeUpgradeAction"/> > </execute-stage> > {code} > > But this task should never be auto skipped - I'd argue that it should never > be skipped at all. Either abort the upgrade if this fails or downgrade or > finalize later. However, it seems that the overall approach is to allow most > upgrade items to be skipped. > > If we say that, "No, finalize _must_ also be skippable because we always want > them to 'finish' the upgrade", then I think we'd need to do some work here to > introduce the notion of a non-auto-skip property in the XML. > > {code} > <group xsi:type="cluster" name="POST_CLUSTER" title="Finalize > {{direction.text.proper}}"> > <skippable>true</skippable> > <supports-auto-skip-failure>false</supports-auto-skip-failure> > {code} > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java > ef50963 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > 915e431 > > ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java > 8b167ca > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StageEntity.java > e801233 > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/AutoSkipFailedSummaryAction.java > 80c1611 > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java > 1b59b94 > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java > 4ef14a6 > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java > 7497c23 > > ambari-server/src/main/java/org/apache/ambari/server/topology/LogicalRequest.java > f29e0f4 > > ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java > ed4b22a > ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql 62d8054 > ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql fe024ce > ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 3ae65ee > ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql > c014443 > ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql bba17a5 > ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql 60938c3 > > ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml > fd28ce8 > > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml > a22f24d > > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml > b9ad6fe > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml > 5248d7a > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml > 6a1f62d > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml > b6c8498 > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml > 60723b7 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java > 3cbf62b > > ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java > f26ab23 > > ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java > 94a5336 > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java > 4612587 > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml > 41c1123 > > Diff: https://reviews.apache.org/r/40140/diff/ > > > Testing > ------- > > Manually verified that certain upgrade groups will not be automatically > skipped during an upgrade (observed the correct boolean on the underlying > tasks). Switched the auto skip flag on and off during an upgrade. > > Unit tests in progress... > > > Thanks, > > Jonathan Hurley > >
