Revert "BUG-69351. unable to add users permission for tez view. (dipayanb)"
Change-Id: I05c0ee3fc4ed2ee01458b045f205e3d6abd751fd Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/640b4714 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/640b4714 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/640b4714 Branch: refs/heads/AMBARI-2.4.2.16 Commit: 640b47143176955d13b4f72710f886a0144c8418 Parents: c5b550f Author: Dipayan Bhowmick <[email protected]> Authored: Wed Nov 23 02:25:31 2016 +0530 Committer: Dipayan Bhowmick <[email protected]> Committed: Wed Nov 23 02:25:31 2016 +0530 ---------------------------------------------------------------------- .../apache/ambari/server/view/ViewRegistry.java | 45 ++++++-------------- 1 file changed, 12 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/640b4714/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 31a66d1..7f58485 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 @@ -708,46 +708,25 @@ public class ViewRegistry { LOG.debug("Copy all privileges from " + sourceInstanceEntity.getName() + " to " + targetInstanceEntity.getName()); List<PrivilegeEntity> targetInstancePrivileges = privilegeDAO.findByResourceId(targetInstanceEntity.getResource().getId()); - List<PrivilegeEntity> sourceInstancePrivileges = privilegeDAO.findByResourceId(sourceInstanceEntity.getResource().getId()); - - // Do not run migration when the target Instance has already got some privileges. - // This means that the upgrade process would have already run during the first start of ambari after upgrade if (targetInstancePrivileges.size() > 0) { - return; + LOG.warn("Target instance {} already has privileges assigned, these will not be deleted. Manual clean up may be needed",targetInstanceEntity.getName()); } + List<PrivilegeEntity> sourceInstancePrivileges = privilegeDAO.findByResourceId(sourceInstanceEntity.getResource().getId()); for (PrivilegeEntity sourcePrivilege : sourceInstancePrivileges) { - if (checkAdditionOfPrivilegesRequired(sourcePrivilege, targetInstancePrivileges)) { - PrivilegeEntity targetPrivilege = new PrivilegeEntity(); - targetPrivilege.setPrincipal(sourcePrivilege.getPrincipal()); - targetPrivilege.setResource(targetInstanceEntity.getResource()); - targetPrivilege.setPermission(sourcePrivilege.getPermission()); - try { - privilegeDAO.create(targetPrivilege); - targetPrivilege.getPrincipal().getPrivileges().add(sourcePrivilege); - } catch (Exception e){ - LOG.warn("Could not migrate privilege {} ",targetPrivilege); - LOG.error("Caught exception",e); - } + PrivilegeEntity targetPrivilege = new PrivilegeEntity(); + targetPrivilege.setPrincipal(sourcePrivilege.getPrincipal()); + targetPrivilege.setResource(targetInstanceEntity.getResource()); + targetPrivilege.setPermission(sourcePrivilege.getPermission()); + try { + privilegeDAO.create(targetPrivilege); + targetPrivilege.getPrincipal().getPrivileges().add(sourcePrivilege); + } catch (Exception e){ + LOG.warn("Could not migrate privilege {} ",targetPrivilege); + LOG.error("Caught exception",e); } - } - - } - /** - * Checks if the all the targetPrivileges are different than the sourcePrivilege - * @param sourcePrivilege - Source privilege - * @param targetInstancePrivileges - target privileges - * @return true if the sourcePrivilege is different than all the targetPrivileges - */ - private boolean checkAdditionOfPrivilegesRequired(PrivilegeEntity sourcePrivilege, List<PrivilegeEntity> targetInstancePrivileges) { - for (PrivilegeEntity targetPrivilege : targetInstancePrivileges) { - if (targetPrivilege.getPermission().getId().equals(sourcePrivilege.getPermission().getId()) && - targetPrivilege.getPrincipal().getId().equals(sourcePrivilege.getPrincipal().getId())) { - return false; - } } - return true; } /**
