----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/33416/#review81118 -----------------------------------------------------------
Ship it! One question about whether non-stack, non-service configs are copied. If they are, then this looks good. ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java <https://reviews.apache.org/r/33416/#comment131369> Will this copy non-stack, non-service types like cluster-env ? - Jonathan Hurley On April 21, 2015, 6:23 p.m., Nate Cole wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/33416/ > ----------------------------------------------------------- > > (Updated April 21, 2015, 6:23 p.m.) > > > Review request for Ambari and Jonathan Hurley. > > > Bugs: AMBARI-10636 > https://issues.apache.org/jira/browse/AMBARI-10636 > > > Repository: ambari > > > Description > ------- > > * Add config merging when upgrading across stack versions > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java > bcce006 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > 483e169 > > ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java > 2ed9846 > > ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java > 148e234 > > ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java > 706e493 > > ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java > 64eaa10 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java > 6b691e0 > ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml > PRE-CREATION > > Diff: https://reviews.apache.org/r/33416/diff/ > > > Testing > ------- > > Manual + automated > > Tests run: 2874, Failures: 0, Errors: 01, Skipped: 17 > > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 22:43.708s > [INFO] Finished at: Tue Apr 21 18:02:19 EDT 2015 > [INFO] Final Memory: 39M/569M > [INFO] > ------------------------------------------------------------------------ > > > Thanks, > > Nate Cole > >
