ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [05/50] ambari git commit: Revert "AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)"
Date Wed, 01 Mar 2017 20:38:22 GMT
Revert "AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file
does not exist error (Attila Magyar via adoroszlai)"

This reverts commit daf876665a57966d58c1ed6aa0f53b14a81265c6.


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b280e846f2d509595c1dbb89f72c95053833220c
Parents: 924749b
Author: Attila Doroszlai <adoroszlai@hortonworks.com>
Authored: Tue Feb 28 11:24:53 2017 +0100
Committer: Attila Doroszlai <adoroszlai@hortonworks.com>
Committed: Tue Feb 28 11:24:53 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/b280e846/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 b968383..5d6ccc0 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
@@ -218,8 +218,8 @@ public class CreateKeytabFilesServerAction extends KerberosServerAction
{
               }
 
               if (password == null) {
-                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
+                if (hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME) ||
kerberosPrincipalHostDAO
+                  .exists(evaluatedPrincipal, hostEntity.getHostId())) {
                   // 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