Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B0B44200BC9 for ; Fri, 21 Oct 2016 19:19:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AF877160B0D; Fri, 21 Oct 2016 17:19:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B35C8160ADE for ; Fri, 21 Oct 2016 19:19:51 +0200 (CEST) Received: (qmail 18598 invoked by uid 500); 21 Oct 2016 17:19:50 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 17964 invoked by uid 99); 21 Oct 2016 17:19:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Oct 2016 17:19:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E87BE3934; Fri, 21 Oct 2016 17:19:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Fri, 21 Oct 2016 17:20:05 -0000 Message-Id: In-Reply-To: <89e5be22d93c4829ab54e45e73b6fc38@git.apache.org> References: <89e5be22d93c4829ab54e45e73b6fc38@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/30] ambari git commit: AMBARI-18371. View migration removes current permissions. (Ashwin Rajeev via dipayanb) archived-at: Fri, 21 Oct 2016 17:19:52 -0000 AMBARI-18371. View migration removes current permissions. (Ashwin Rajeev via dipayanb) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d5178ce Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d5178ce Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d5178ce Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 1d5178ce727c02d1eb064e210e421ed54428448e Parents: 5fdc9f9 Author: Dipayan Bhowmick Authored: Thu Oct 20 22:08:48 2016 +0530 Committer: Dipayan Bhowmick Committed: Thu Oct 20 22:13:39 2016 +0530 ---------------------------------------------------------------------- .../org/apache/ambari/server/view/ViewRegistry.java | 14 ++++++++------ .../server/view/ViewDataMigrationUtilityTest.java | 3 --- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1d5178ce/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java index 156fd5b..455b4f1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java @@ -711,10 +711,7 @@ public class ViewRegistry { targetInstanceEntity.getName()); List targetInstancePrivileges = privilegeDAO.findByResourceId(targetInstanceEntity.getResource().getId()); if (targetInstancePrivileges.size() > 0) { - LOG.warn("Old privileges will be removed for " + targetInstanceEntity.getName()); - for (PrivilegeEntity privilegeEntity : targetInstancePrivileges) { - removePrivilegeEntity(privilegeEntity); - } + LOG.warn("Target instance {} already has privileges assigned, these will not be deleted. Manual clean up may be needed",targetInstanceEntity.getName()); } List sourceInstancePrivileges = privilegeDAO.findByResourceId(sourceInstanceEntity.getResource().getId()); @@ -723,9 +720,14 @@ public class ViewRegistry { targetPrivilege.setPrincipal(sourcePrivilege.getPrincipal()); targetPrivilege.setResource(targetInstanceEntity.getResource()); targetPrivilege.setPermission(sourcePrivilege.getPermission()); - privilegeDAO.create(targetPrivilege); + try { + privilegeDAO.create(targetPrivilege); + targetPrivilege.getPrincipal().getPrivileges().add(sourcePrivilege); + } catch (Exception e){ + LOG.warn("Could not migrate privilege {} ",targetPrivilege); + LOG.error("Caught exception",e); + } - targetPrivilege.getPrincipal().getPrivileges().add(sourcePrivilege); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/1d5178ce/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationUtilityTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationUtilityTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationUtilityTest.java index f997589..0306c0a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationUtilityTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationUtilityTest.java @@ -18,7 +18,6 @@ package org.apache.ambari.server.view; import junit.framework.Assert; -import org.apache.ambari.server.api.services.ViewDataMigrationService; import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.view.migration.ViewDataMigrationContext; @@ -34,8 +33,6 @@ import java.util.HashMap; import java.util.Map; import static org.easymock.EasyMock.*; -import static org.easymock.EasyMock.replay; -import static org.junit.Assert.*; /** * ViewDataMigrationUtility Tests.