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 4664D17AD0 for ; Tue, 3 Feb 2015 16:42:02 +0000 (UTC) Received: (qmail 63218 invoked by uid 500); 3 Feb 2015 16:42:03 -0000 Delivered-To: apmail-ambari-dev-archive@ambari.apache.org Received: (qmail 63183 invoked by uid 500); 3 Feb 2015 16:42:03 -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 63167 invoked by uid 99); 3 Feb 2015 16:42:02 -0000 Received: from reviews-vm.apache.org (HELO reviews.apache.org) (140.211.11.40) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2015 16:42:02 +0000 Received: from reviews.apache.org (localhost [127.0.0.1]) by reviews.apache.org (Postfix) with ESMTP id 41FB01CAC23; Tue, 3 Feb 2015 16:42:06 +0000 (UTC) Content-Type: multipart/alternative; boundary="===============1807220073383344807==" MIME-Version: 1.0 Subject: Re: Review Request 30485: Service configurations are not updated as customized in the descriptor From: "John Speidel" To: "John Speidel" , "Robert Nettleton" Cc: "Robert Levas" , "Ambari" Date: Tue, 03 Feb 2015 16:42:06 -0000 Message-ID: <20150203164206.32500.32561@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/30485/ X-Sender: "John Speidel" References: <20150203164145.30543.28162@reviews.apache.org> In-Reply-To: <20150203164145.30543.28162@reviews.apache.org> Reply-To: "John Speidel" X-ReviewRequest-Repository: ambari --===============1807220073383344807== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit > On Feb. 3, 2015, 4:41 p.m., John Speidel wrote: > > looks good - John ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/30485/#review70763 ----------------------------------------------------------- On Feb. 1, 2015, 1:04 p.m., Robert Levas wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/30485/ > ----------------------------------------------------------- > > (Updated Feb. 1, 2015, 1:04 p.m.) > > > Review request for Ambari, John Speidel and Robert Nettleton. > > > Bugs: AMBARI-9406 > https://issues.apache.org/jira/browse/AMBARI-9406 > > > Repository: ambari > > > Description > ------- > > The Kerberos descriptor was saved with the customized value for smokeuser > > ``` > (${cluster-env/smokeuser}/c1@${realm}) > ``` > > The generated principal had the default value (i.e without /c1) and the corresponding configurations also had the default value > > ``` > (${cluster-env/smokeuser}@${realm}) > ``` > > The reason for this is that the Kerberos descriptor stored for the cluster was not being used when generating principals. The solution is to read the configuration from the cluster artifact and use appropriately. While at it, added factories for `KerberosDescriptor` and `KerberosServiceDescriptor` and fixed implemenation where cluster artifact data was incorrectly being parsed into a `KerberosDescriptor`. > > Most of the changes were due to refactoring the `KerberosDescriptor` and `KerberosServiceDescriptor` classes to move static methods to relevant factory classes. > > > Diffs > ----- > > ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java 897cf52 > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b6dd5c4 > ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterRequest.java 9e097c3 > ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java 8647f26 > ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java fd1fb57 > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java 49b8d5d > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b1e05cc > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java bdf79b9 > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java 89ac9d7 > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java 717be2f > ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptor.java 41d100b > ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorFactory.java PRE-CREATION > ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java 0c05859 > ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorFactory.java PRE-CREATION > ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptor.java 1f5e94f > ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptorFactory.java PRE-CREATION > ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java c0ff4a6 > ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java e0667da > ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java 3532e69 > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java 337cc74 > ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java cf426b0 > ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java e4e9776 > ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptorTest.java 9785e54 > > Diff: https://reviews.apache.org/r/30485/diff/ > > > Testing > ------- > > Manually tested in test cluster > Updated unit tests > > > # Jenkins test results > Running org.apache.ambari.server.api.services.AmbariMetaInfoTest > Tests run: 63, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.69 sec > > Running org.apache.ambari.server.controller.AmbariManagementControllerImplTest > Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.094 sec > > Running org.apache.ambari.server.controller.KerberosHelperTest > Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.488 sec > > Running org.apache.ambari.server.controller.internal.HostComponentResourceProviderTest > Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.071 sec > > Running org.apache.ambari.server.stack.KerberosDescriptorTest > Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.194 sec > > Running org.apache.ambari.server.state.kerberos.KerberosDescriptorTest > Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.279 sec > > Running org.apache.ambari.server.state.kerberos.KerberosServiceDescriptorTest > Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.231 sec > > Ambari server test suite > Tests run: 2633, Failures: 0, Errors: 0, Skipped: 15 > > [INFO] ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] ------------------------------------------------------------------------ > [INFO] Total time: 01:06 h > [INFO] Finished at: 2015-02-01T12:48:17+00:00 > [INFO] Final Memory: 44M/534M > [INFO] ------------------------------------------------------------------------ > > > Thanks, > > Robert Levas > > --===============1807220073383344807==--