You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ambari.apache.org by Nate Cole <nc...@hortonworks.com> on 2015/04/19 16:28:15 UTC
Review Request 33340: Add Prerequisite Check for Merged Configs
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/
-----------------------------------------------------------
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
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Nate Cole <nc...@hortonworks.com>.
> On April 19, 2015, 3:13 p.m., Alejandro Fernandez wrote:
> > ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java, line 156
> > <https://reviews.apache.org/r/33340/diff/1/?file=934992#file934992line156>
> >
> > I sure hope we always use the same case for "g" or "m".
Good point. I'll add the caps to the regex too.
> On April 19, 2015, 3:13 p.m., Alejandro Fernandez wrote:
> > ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java, line 60
> > <https://reviews.apache.org/r/33340/diff/1/?file=934992#file934992line60>
> >
> > I want to confirm my understanding:
> > If a service is added in the newer stack, then no conflicts.
> > It's only when the property changes value, or the property is removed entirely (perhaps component could be removed) that a conflict may arise.
We can never have a service added the newer stack to be in conflict since it couldn't have been installed for the old stack.
> On April 19, 2015, 3:13 p.m., Alejandro Fernandez wrote:
> > ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java, line 73
> > <https://reviews.apache.org/r/33340/diff/1/?file=934988#file934988line73>
> >
> > Why not just do the break inside here?
Result of a million iterations to check it :) Will fix.
> On April 19, 2015, 3:13 p.m., Alejandro Fernandez wrote:
> > ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java, line 60
> > <https://reviews.apache.org/r/33340/diff/1/?file=934987#file934987line60>
> >
> > findByVersion can return a null, need to check for it.
Will add the null check to the isApplicable(), because if it passes there then it will be guaranteed to be non-null during perform()
> On April 19, 2015, 3:13 p.m., Alejandro Fernandez wrote:
> > ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java, line 98
> > <https://reviews.apache.org/r/33340/diff/1/?file=934987#file934987line98>
> >
> > My need to check that twv.oldStackValue is not null in the last condition.
> >
> > If a property is being added, it will be null in oldStackValue, and say 1 in both twv.savedValue and twv.newStackValue, and this will generate a conflict even though a new property is being added.
> >
> > Is this the case? If not, can drop the issue.
Good catch, will add a check and a test for that scenario.
- Nate
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/#review80636
-----------------------------------------------------------
On April 19, 2015, 10:28 a.m., Nate Cole wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/33340/
> -----------------------------------------------------------
>
> (Updated April 19, 2015, 10:28 a.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
>
>
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Alejandro Fernandez <af...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/#review80636
-----------------------------------------------------------
ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java
<https://reviews.apache.org/r/33340/#comment130765>
findByVersion can return a null, need to check for it.
ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java
<https://reviews.apache.org/r/33340/#comment130769>
My need to check that twv.oldStackValue is not null in the last condition.
If a property is being added, it will be null in oldStackValue, and say 1 in both twv.savedValue and twv.newStackValue, and this will generate a conflict even though a new property is being added.
Is this the case? If not, can drop the issue.
ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java
<https://reviews.apache.org/r/33340/#comment130766>
Why not just do the break inside here?
ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
<https://reviews.apache.org/r/33340/#comment130767>
I want to confirm my understanding:
If a service is added in the newer stack, then no conflicts.
It's only when the property changes value, or the property is removed entirely (perhaps component could be removed) that a conflict may arise.
ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
<https://reviews.apache.org/r/33340/#comment130771>
I sure hope we always use the same case for "g" or "m".
- Alejandro Fernandez
On April 19, 2015, 2:28 p.m., Nate Cole wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/33340/
> -----------------------------------------------------------
>
> (Updated April 19, 2015, 2:28 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
>
>
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Alejandro Fernandez <af...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/#review80779
-----------------------------------------------------------
ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java
<https://reviews.apache.org/r/33340/#comment130901>
If null == oldValue, still need to check that saved <> new.
ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java
<https://reviews.apache.org/r/33340/#comment130902>
This will have to be old != new && old != saved
- 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
>
>
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Alejandro Fernandez <af...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/#review80781
-----------------------------------------------------------
Ship it!
Ship It!
- 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
>
>
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Tom Beerbower <tb...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/#review80718
-----------------------------------------------------------
Ship it!
Ship It!
- Tom Beerbower
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
>
>
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Nate Cole <nc...@hortonworks.com>.
> On April 20, 2015, 1:14 p.m., Alejandro Fernandez wrote:
> > ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java, line 98
> > <https://reviews.apache.org/r/33340/diff/1-2/?file=934987#file934987line98>
> >
> > 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
> > }
> > }
The premise is this:
* <ul>
* <li>A value that has been customized from HDP 2.2.x.x no longer exists in HDP 2.3.x.x</li>
* <li>A value that has been customized from HDP 2.2.x.x has changed its default value between HDP 2.2.x.x and HDP 2.3.x.x</li>
* </ul>
Conflicts are a result of saved vs new.
Old | Saved | New | Result
null y y ok, new prop
null y n conflict, saved vs stack is different
x y y ok, value won't change from current
x y x ok, since defaults are the same, the saved value will be used (not in conflict)
x x x ok
x y z conflict, since the saved value is different from new value AND the old value
- Nate
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/#review80746
-----------------------------------------------------------
On April 20, 2015, 9:09 a.m., Nate Cole wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/33340/
> -----------------------------------------------------------
>
> (Updated April 20, 2015, 9:09 a.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
>
>
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Alejandro Fernandez <af...@hortonworks.com>.
-----------------------------------------------------------
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
>
>
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Nate Cole <nc...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/
-----------------------------------------------------------
(Updated April 20, 2015, 9:09 a.m.)
Review request for Ambari, Alejandro Fernandez, Jonathan Hurley, and Tom Beerbower.
Changes
-------
Updated patch for comments
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 (updated)
-----
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
Re: Review Request 33340: Add Prerequisite Check for Merged Configs
Posted by Jonathan Hurley <jh...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33340/#review80647
-----------------------------------------------------------
Ship it!
Ship It!
- Jonathan Hurley
On April 19, 2015, 10:28 a.m., Nate Cole wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/33340/
> -----------------------------------------------------------
>
> (Updated April 19, 2015, 10:28 a.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
>
>