----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/51460/#review146974 -----------------------------------------------------------
Ship it! A great start. It's a real shame that JAXB doesn't support things like the assertions. I'm also very concerned about duplicate groups in the order/processing section. I don't think there's a way to enforce uniqueness, is there? ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java (line 65) <https://reviews.apache.org/r/51460/#comment213914> Any reason this needs to be concurrent? I wouldn't expect other threads reading from this while it's being populated. - Jonathan Hurley On Aug. 26, 2016, 11:41 a.m., Nate Cole wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/51460/ > ----------------------------------------------------------- > > (Updated Aug. 26, 2016, 11:41 a.m.) > > > Review request for Ambari, Alejandro Fernandez, Dmitro Lisnichenko, and > Jonathan Hurley. > > > Bugs: AMBARI-18232 > https://issues.apache.org/jira/browse/AMBARI-18232 > > > Repository: ambari > > > Description > ------- > > Adds xsd for upgrade packs. Notes: > > - Changes to upgrade packs: there were a lot of non-matching java elements > that were being put into xml. > -- tasks don't have a summary attribute, only a summary element > -- Some STORM/DRPC_SERVER elements had execute-stages that aren't supported. > - I wanted to add an XSD assertion that enforced pre-downgrade to be required > with pre-upgrade, but that isn't available in JAXB yet (assert element is XSD > 1.1 only). We can address that in a future patch. > - This is the initial xsd. A lot more documentation can be added, but I > figured we need a starting point sooner rather than later. > - Unit tests check source and test paths for upgrade packs and tests both > parsing and "should have xsd" > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java > f2647fd > > ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java > 7d47339 > > ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java > e938e68 > > ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java > bfba021 > ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java > 0606f2a > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureFunction.java > 086551e > > ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml > 94c5c46 > > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml > d0bfec2 > > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml > 3168f10 > > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml > 0f15286 > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml > 9f0f421 > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml > 41b516a > ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml > 4a704ad > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml > b7465f7 > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml > eb6f333 > > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml > f5f06c0 > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml > 533a1e9 > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml > 6583010 > ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml > 09bd2ac > > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml > 750f934 > > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml > 6f9372e > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml > abf2db3 > ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml > f20ad06 > ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml ad8cfd4 > > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml > cbab386 > ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml > 60e81c0 > ambari-server/src/main/resources/upgrade-pack.xsd PRE-CREATION > > ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java > c6701b6 > > ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml > fd798da > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml > 085ba25 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml > 76e42d7 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_grouping_rolling.xml > b8b5511 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml > c79c8e7 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml > b6c49e9 > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml > 6dc143a > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml > 85736e1 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml > 9f57ca8 > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml > 23e8bbc > > ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml > bfd994e > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml > 5d41754 > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_15388.xml > 4e8e2ea > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml > b56b935 > > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml > b2c4b93 > > ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml > e339399 > > ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/upgrades/upgrade_test_15388.xml > 9e935ec > > Diff: https://reviews.apache.org/r/51460/diff/ > > > Testing > ------- > > Manual with full RU. Automated: > > Tests run: 4611, Failures: 0, Errors: 0, Skipped: 34 > > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 36:48.137s > [INFO] Finished at: Fri Aug 26 10:13:53 EDT 2016 > [INFO] Final Memory: 36M/719M > [INFO] > ------------------------------------------------------------------------ > > > Thanks, > > Nate Cole > >
