Mailing-List: contact dev-help@ambari.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ambari.apache.org
Content-Type: multipart/alternative;
 boundary="===============2253431694519986765=="
MIME-Version: 1.0
Subject: Re: Review Request 33416: Merge Configs on Upgrade Across Stack
 Version
From: "Nate Cole" <ncole@hortonworks.com>
To: "Jonathan Hurley" <jhurley@hortonworks.com>
Cc: "Nate Cole" <ncole@hortonworks.com>, "Ambari" <dev@ambari.apache.org>
Date: Wed, 22 Apr 2015 12:44:58 -0000
Message-ID: <20150422124458.2948.84643@reviews.apache.org>
Auto-Submitted: auto-generated
Sender: "Nate Cole" <noreply@reviews.apache.org>
References: <20150422040141.2948.93143@reviews.apache.org>
In-Reply-To: <20150422040141.2948.93143@reviews.apache.org>
Reply-To: "Nate Cole" <ncole@hortonworks.com>

--===============2253431694519986765==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit


> On April 22, 2015, 12:01 a.m., Jonathan Hurley wrote:
> > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java, lines 646-652
> > <https://reviews.apache.org/r/33416/diff/1/?file=938850#file938850line646>
> >
> >     Will this copy non-stack, non-service types like cluster-env ?

That's done around line 605-ish (cluster-env is a stack-based type):

    // !!! stack
    Set<org.apache.ambari.server.state.PropertyInfo> pi = s_metaProvider.get().getStackProperties(newStack.getStackName(),
        newStack.getStackVersion());


- Nate


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/33416/#review81118
-----------------------------------------------------------


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
> 
>


--===============2253431694519986765==--