[ambari] branch trunk updated: AMBARI-25788: Ambari server keeps generating keytabs even with KerberosServerAction#OperationType.CREATE_MISSING option. (#3587)

[brahma]

This is an automated email from the ASF dual-hosted git repository.

brahma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f1b2fa26ed AMBARI-25788: Ambari server keeps generating keytabs even 
with KerberosServerAction#OperationType.CREATE_MISSING option. (#3587)
f1b2fa26ed is described below

commit f1b2fa26ed942dcc92c3b44224039986b58cacb0
Author: Yubi Lee <eubn...@gmail.com>
AuthorDate: Tue Mar 7 02:52:30 2023 +0900

    AMBARI-25788: Ambari server keeps generating keytabs even with 
KerberosServerAction#OperationType.CREATE_MISSING option. (#3587)
    
    Signed-off-by: Brahma Reddy Battula <bra...@apache.org>
---
 .../server/serveraction/kerberos/CreateKeytabFilesServerAction.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8e7dea745c..6a2d2aac41 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
@@ -355,7 +355,7 @@ public class CreateKeytabFilesServerAction extends 
KerberosServerAction {
             String previousCachedFilePath = 
principalEntity.getCachedKeytabPath();
             String cachedKeytabFilePath = (cachedKeytabFile.exists()) ? 
cachedKeytabFile.getAbsolutePath() : null;
 
-            if (previousCachedFilePath != null && 
!previousCachedFilePath.equals(cachedKeytabFilePath)) {
+            if (previousCachedFilePath == null || 
!previousCachedFilePath.equals(cachedKeytabFilePath)) {
               principalEntity.setCachedKeytabPath(cachedKeytabFilePath);
               kerberosPrincipalDAO.merge(principalEntity);
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org