Return-Path: X-Original-To: apmail-ambari-dev-archive@www.apache.org Delivered-To: apmail-ambari-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E8AB717A32 for ; Wed, 22 Apr 2015 04:01:40 +0000 (UTC) Received: (qmail 75489 invoked by uid 500); 22 Apr 2015 04:01:40 -0000 Delivered-To: apmail-ambari-dev-archive@ambari.apache.org Received: (qmail 75457 invoked by uid 500); 22 Apr 2015 04:01:40 -0000 Mailing-List: contact dev-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ambari.apache.org Delivered-To: mailing list dev@ambari.apache.org Received: (qmail 75432 invoked by uid 99); 22 Apr 2015 04:01:40 -0000 Received: from reviews-vm.apache.org (HELO reviews.apache.org) (140.211.11.40) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 04:01:40 +0000 Received: from reviews.apache.org (localhost [127.0.0.1]) by reviews.apache.org (Postfix) with ESMTP id 8C46B1CE0CC; Wed, 22 Apr 2015 04:01:41 +0000 (UTC) Content-Type: multipart/alternative; boundary="===============3165985108680012011==" MIME-Version: 1.0 Subject: Re: Review Request 33416: Merge Configs on Upgrade Across Stack Version From: "Jonathan Hurley" To: "Jonathan Hurley" Cc: "Nate Cole" , "Ambari" Date: Wed, 22 Apr 2015 04:01:41 -0000 Message-ID: <20150422040141.2948.93143@reviews.apache.org> X-ReviewBoard-URL: https://reviews.apache.org/ Auto-Submitted: auto-generated Sender: "Jonathan Hurley" X-ReviewGroup: Ambari X-ReviewRequest-URL: https://reviews.apache.org/r/33416/ X-Sender: "Jonathan Hurley" References: <20150421222335.2947.97601@reviews.apache.org> In-Reply-To: <20150421222335.2947.97601@reviews.apache.org> Reply-To: "Jonathan Hurley" X-ReviewRequest-Repository: ambari --===============3165985108680012011== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit ----------------------------------------------------------- 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 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 > > --===============3165985108680012011==--