----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/55481/#review161508 -----------------------------------------------------------
Ship it! Ship It! - Tim Thorpe On Jan. 13, 2017, 1:42 a.m., Nate Cole wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/55481/ > ----------------------------------------------------------- > > (Updated Jan. 13, 2017, 1:42 a.m.) > > > Review request for Ambari, Alejandro Fernandez, Dmitro Lisnichenko, Jonathan > Hurley, and Tim Thorpe. > > > Repository: ambari > > > Description > ------- > > When creating the initial upgrade packs, an effort was made to make them as > least-verbose as possible. In that, we assumed that all tasks that occurred > during an Upgrade would also occur on a Downgrade. That assumption led to > some sneaky bugs that are difficult to troubleshoot. > > The real fix is to make the XSD enforce "sibling" elements, such that when > PRE-UPGRADE tasks are defined, you can enforce that a PRE-DOWNGRADE element > exist. Unfortunately, the JDK (even 1.8) doesn't support that version of XSD > in JAXB. > > The interim solution was to use the afterUnmarshal secret sauce to validate > that the elements exist. Allow a pre-downgrade or post-downgrade element to > indicate that it can reuse the (pre-post)upgrade element definitions. > > Many of the changes here are in upgrade packs to add the new required > elements, and the unit test that parses all upgrade packs passes. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java > d76d59f > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java > 76f1897 > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java > 0b9cb3d > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml > d274135 > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml > 8c9414a > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml > fa6d46b > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml > 42918ff > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml > a2286d8 > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml > c082e3b > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml > ec317a9 > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml > a0a7929 > > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml > b9a7e1e > > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml > d22e94a > > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml > 58ca724 > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml > 968e3b7 > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml > 9c61c39 > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml > 9b3ce4e > > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml > 11c59e9 > > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml > 6bca487 > > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml > 78418b0 > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml > 076b45b > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml > 4abf0ec > > ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-ordered-upgrade.xml > e7aace9 > > ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml > 1c65f9b > ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml > eb4309a > ambari-server/src/main/resources/upgrade-pack.xsd 3963a2c > > ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java > 50780e3 > > ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackParsingTest.java > PRE-CREATION > > ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java > d9b1dd6 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml > 8ca9df4 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_component_tasks_test.xml > PRE-CREATION > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml > 802a04c > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml > 018dab3 > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml > cba7685 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml > 6476978 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml > 9348aa5 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml > f505220 > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml > 7fe275f > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_15388.xml > 1f0d9bf > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml > ed9391f > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_host_ordered.xml > 020a49f > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml > dae1c16 > > ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/upgrades/upgrade_test_15388.xml > 947f05a > > Diff: https://reviews.apache.org/r/55481/diff/ > > > Testing > ------- > > Manual testing. Automated: > > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 34:19.858s > [INFO] Finished at: Thu Jan 12 19:53:25 EST 2017 > [INFO] Final Memory: 43M/669M > [INFO] > ------------------------------------------------------------------------ > > > Thanks, > > Nate Cole > >
