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 7B0A710B03 for ; Tue, 13 Jan 2015 15:53:36 +0000 (UTC) Received: (qmail 67989 invoked by uid 500); 13 Jan 2015 15:53:38 -0000 Delivered-To: apmail-ambari-dev-archive@ambari.apache.org Received: (qmail 67964 invoked by uid 500); 13 Jan 2015 15:53:38 -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 67948 invoked by uid 99); 13 Jan 2015 15:53:37 -0000 Received: from reviews-vm.apache.org (HELO reviews.apache.org) (140.211.11.40) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2015 15:53:37 +0000 Received: from reviews.apache.org (localhost [127.0.0.1]) by reviews.apache.org (Postfix) with ESMTP id CAE9A1D2CB4; Tue, 13 Jan 2015 15:53:34 +0000 (UTC) Content-Type: multipart/alternative; boundary="===============5302746262555567582==" MIME-Version: 1.0 Subject: Re: Review Request 29824: Re-introduce usage of excluded-configs API in Blueprint processor From: "John Speidel" To: "John Speidel" , "Robert Levas" , "Tom Beerbower" Cc: "Ambari" , "Robert Nettleton" Date: Tue, 13 Jan 2015 15:53:34 -0000 Message-ID: <20150113155334.23996.96835@reviews.apache.org> X-ReviewBoard-URL: https://reviews.apache.org Auto-Submitted: auto-generated Sender: "John Speidel" X-ReviewGroup: Ambari X-ReviewRequest-URL: https://reviews.apache.org/r/29824/ X-Sender: "John Speidel" References: <20150112215528.23996.54568@reviews.apache.org> In-Reply-To: <20150112215528.23996.54568@reviews.apache.org> Reply-To: "John Speidel" X-ReviewRequest-Repository: ambari --===============5302746262555567582== 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/29824/#review67866 ----------------------------------------------------------- Ship it! Ship It! - John Speidel On Jan. 12, 2015, 9:55 p.m., Robert Nettleton wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/29824/ > ----------------------------------------------------------- > > (Updated Jan. 12, 2015, 9:55 p.m.) > > > Review request for Ambari, John Speidel, Robert Levas, and Tom Beerbower. > > > Repository: ambari > > > Description > ------- > > This patch implements a fix for AMBARI-9097. > > Falcon deployments are not currently working with Blueprints. > > The ClusterResourceProvider is not currently handling the case > of a Falcon Blueprints deployment, with respect to configuration > handling. > > A portion of the changes from the fix for AMBARI-8009 originally > addressed this problem by adding some code to filter out the > "excluded" configuration references for a given stack service, since > only included config references should be used during a cluster > configuration update. > > Some code refactorings in the patch for AMBARI-7175 moved the filtering > code to a separate location, and this eventually resulted in a > breakage, since some components seem to interpret "excluded" > configuration references differently. > > To resolve this issue, this current patch implements the following: > > - Re-introduces some of the changes from AMBARI-8009 that were removed by > subsequent refactorings. These changes modify the ClusterResourceProvider's > setConfigurationsOnCluster() method, so that excluded configuration > references are not included for a given service's config change > request. > > - Implements new unit tests to verify this change. > > - Updates some existing unit tests to reflect the changes to the Stack > class. > > > Diffs > ----- > > ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java 0eecb3f > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java 2d6ad8f > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java 243e282 > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java c620bc6 > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java bc2fc02 > > Diff: https://reviews.apache.org/r/29824/diff/ > > > Testing > ------- > > 1. Ran ambari-server unit tests, all Java tests passing. Some python failures, but these are due to a separate problem currently being addressed in the codebase. > 2. Manually verified that applying this patch will fix Falcon Blueprints deployments in single-node and multi-node clusters. > > > Thanks, > > Robert Nettleton > > --===============5302746262555567582==--