AMBARI-18755. Deployment failing at creating principal

1 files changed, 10 insertions, 7 deletions

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
index a21d330b27..624369bf53 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
@@ -466,14 +466,17 @@ public class MITKerberosOperationHandler extends KerberosOperationHandler {
         if (tries == retryCount) {
           throw exception;
         }
-      } finally {
-        if (result != null && result.isSuccessful()) {
-          break; // break on successful result
-        }
-        tries++;
-        String message = String.format("Retrying to execute kadmin:\n\tCommand: %s", command);
-        LOG.warn(message);
       }
+
+      if (result != null && result.isSuccessful()) {
+        break; // break on successful result
+      }
+      tries++;
+
+      try { Thread.sleep(3000); } catch (InterruptedException e) {}
+
+      String message = String.format("Retrying to execute kadmin after a wait of 3 seconds :\n\tCommand: %s", command);
+      LOG.warn(message);
     }