Bladeren bron

Revert "HUE-7697 [core] Allow Kerberos Renewer to retry kinit multiple times"

This reverts commit 5bd992a39d939377fb7120ee4081f6561f1a2e82.
jdesjean 8 jaren geleden
bovenliggende
commit
f79c67ce1d
1 gewijzigde bestanden met toevoegingen van 7 en 15 verwijderingen
  1. 7 15
      desktop/core/src/desktop/kt_renewer.py

+ 7 - 15
desktop/core/src/desktop/kt_renewer.py

@@ -33,29 +33,21 @@ def renew_from_kt():
           "-t", CONF.HUE_KEYTAB.get(), # specify keytab
           "-c", CONF.CCACHE_PATH.get(), # specify credentials cache
           CONF.HUE_PRINCIPAL.get()]
-  retries = 0
-  max_retries = 3
-  while retries < max_retries:
-     LOG.info("Reinitting kerberos retry attempt %s from keytab %s" % (retries, " ".join(cmdv))
+  LOG.info("Reinitting kerberos from keytab: " +
+           " ".join(cmdv))
 
-     subp = subprocess.Popen(cmdv,
+  subp = subprocess.Popen(cmdv,
                           stdout=subprocess.PIPE,
                           stderr=subprocess.PIPE,
                           close_fds=True,
                           bufsize=-1)
-     subp.wait()
-     if subp.returncode != 0:
-       retries = retries + 1
-       LOG.error("Couldn't reinit from keytab! `kinit' exited with %s.\n%s\n%s" % (
+  subp.wait()
+  if subp.returncode != 0:
+    LOG.error("Couldn't reinit from keytab! `kinit' exited with %s.\n%s\n%s" % (
               subp.returncode,
               "\n".join(subp.stdout.readlines()),
               "\n".join(subp.stderr.readlines())))
-       if retries >= max_retries:
-          LOG.error("FATAL: max_retries of %s reached. Exiting..." % max_retries)
-          sys.exit(subp.returncode)
-       time.sleep(3)
-     else:
-       break
+    sys.exit(subp.returncode)
 
   global NEED_KRB181_WORKAROUND
   if NEED_KRB181_WORKAROUND is None: