----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/33340/#review80746 -----------------------------------------------------------
ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java <https://reviews.apache.org/r/33340/#comment130861> I thought this was going to be, Saved = current New = default value in stack Old | Saved | New | Result null y y ok, new prop x null null conflict x y y conflict x y x ok x x x ok if (old != saved) { if (null == new || (old != new && old != null) { // conflict } } - Alejandro Fernandez On April 20, 2015, 1:09 p.m., Nate Cole wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/33340/ > ----------------------------------------------------------- > > (Updated April 20, 2015, 1:09 p.m.) > > > Review request for Ambari, Alejandro Fernandez, Jonathan Hurley, and Tom > Beerbower. > > > Bugs: AMBARI-10586 > https://issues.apache.org/jira/browse/AMBARI-10586 > > > Repository: ambari > > > Description > ------- > > * Added prereq check for merged configs > * Fixed host check to handle when a version is specified, to check the proper > version > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java > 0db235f > > ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java > PRE-CREATION > > ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java > 0db7e2e > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java > ee8cefce > > ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java > db5e956 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java > dd5ac0a > > ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java > PRE-CREATION > > ambari-server/src/main/java/org/apache/ambari/server/state/stack/PrereqCheckStatus.java > 3384b85 > > ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java > PRE-CREATION > > ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java > 96151af > > Diff: https://reviews.apache.org/r/33340/diff/ > > > Testing > ------- > > Manual cluster testing + Automated: > > Tests run: 2867, Failures: 0, Errors: 0, Skipped: 17 > > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 22:56.903s > [INFO] Finished at: Sun Apr 19 09:40:46 EDT 2015 > [INFO] Final Memory: 40M/780M > [INFO] > ------------------------------------------------------------------------ > > > Thanks, > > Nate Cole > >
