ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adorosz...@apache.org
Subject [1/2] ambari git commit: AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)
Date Fri, 24 Feb 2017 09:24:59 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6d872ad31 -> e1a354b7d
  refs/heads/trunk 19da5823c -> daf876665


AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does
not exist error (Attila Magyar via adoroszlai)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1a354b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1a354b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1a354b7

Branch: refs/heads/branch-2.5
Commit: e1a354b7d912263593c0b8ff406eb230bae4d2f0
Parents: 6d872ad
Author: Attila Magyar <amagyar@hortonworks.com>
Authored: Fri Feb 24 10:23:27 2017 +0100
Committer: Attila Doroszlai <adoroszlai@hortonworks.com>
Committed: Fri Feb 24 10:23:56 2017 +0100

----------------------------------------------------------------------
 .../serveraction/kerberos/CreateKeytabFilesServerAction.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e1a354b7/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index 54de123..2d21752 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -217,8 +217,8 @@ public class CreateKeytabFilesServerAction extends KerberosServerAction
{
               }
 
               if (password == null) {
-                if (hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME) ||
kerberosPrincipalHostDAO
-                  .exists(evaluatedPrincipal, hostEntity.getHostId())) {
+                if (hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME)
+                  || (kerberosPrincipalHostDAO.exists(evaluatedPrincipal, hostEntity.getHostId())
&& destinationKeytabFile.exists())) { // same principal can have multiple keytabs,
therefore checking if keytab file exists
                   // There is nothing to do for this since it must already exist and we don't
want to
                   // regenerate the keytab
                   message = String.format("Skipping keytab file for %s, missing password
indicates nothing to do", evaluatedPrincipal);


Mime
View raw message