Repository: ambari Updated Branches: refs/heads/trunk e2dd1261e -> 3324fd645
AMBARI-16986. Required empty config is present after Upgrade from 2.1.2.1 to 2.4.0.0 for HIVE and HBASE.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3324fd64 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3324fd64 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3324fd64 Branch: refs/heads/trunk Commit: 3324fd64564538bfe1c07f9bda7ab7ddf9e8ffc9 Parents: e2dd126 Author: Vitaly Brodetskyi <[email protected]> Authored: Wed Jun 1 06:21:25 2016 +0300 Committer: Vitaly Brodetskyi <[email protected]> Committed: Wed Jun 1 06:21:25 2016 +0300 ---------------------------------------------------------------------- .../server/controller/KerberosHelperImpl.java | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3324fd64/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java index 1c46a93..cd79e46 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java @@ -18,10 +18,21 @@ package org.apache.ambari.server.controller; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Singleton; -import com.google.inject.persist.Transactional; +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.Role; import org.apache.ambari.server.RoleCommand; @@ -53,8 +64,8 @@ import org.apache.ambari.server.controller.utilities.PredicateBuilder; import org.apache.ambari.server.metadata.RoleCommandOrder; import org.apache.ambari.server.orm.dao.KerberosPrincipalDAO; import org.apache.ambari.server.orm.entities.KerberosPrincipalEntity; -import org.apache.ambari.server.security.authorization.AuthorizationException; import org.apache.ambari.server.security.SecurePasswordHelper; +import org.apache.ambari.server.security.authorization.AuthorizationException; import org.apache.ambari.server.security.credential.Credential; import org.apache.ambari.server.security.credential.PrincipalKeyCredential; import org.apache.ambari.server.security.encryption.CredentialStoreService; @@ -117,20 +128,10 @@ import org.apache.directory.server.kerberos.shared.keytab.Keytab; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Singleton; +import com.google.inject.persist.Transactional; @Singleton public class KerberosHelperImpl implements KerberosHelper { @@ -440,8 +441,7 @@ public class KerberosHelperImpl implements KerberosHelper { return (applyStackAdvisorUpdates) ? applyStackAdvisorUpdates(cluster, cluster.getServices().keySet(), configurations, kerberosConfigurations, propertiesToIgnore, - null, null, - kerberosEnabled) + null, new HashMap<String, Set<String>>(), kerberosEnabled) : kerberosConfigurations; }
