HADOOP-18824. ZKDelegationTokenSecretManager causes ArithmeticExcepti…

…on due to improper numRetries value checking (apache#6052)
K0K0V0K · Sep 14, 2023 · 23360b3 · 23360b3
1 parent dea4464
commit 23360b3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java b/...main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -222,7 +222,7 @@ public ZKDelegationTokenSecretManager(Configuration conf) {
                         ZK_DTSM_ZK_CONNECTION_TIMEOUT_DEFAULT)
                 )
                 .retryPolicy(
-                    new RetryNTimes(numRetries, sessionT / numRetries));
+                    new RetryNTimes(numRetries, numRetries == 0 ? 0 : sessionT / numRetries));
       } catch (Exception ex) {
         throw new RuntimeException("Could not Load ZK acls or auth: " + ex, ex);
       }

diff --git a/.../java/org/apache/hadoop/security/token/delegation/TestZKDelegationTokenSecretManager.java b/.../java/org/apache/hadoop/security/token/delegation/TestZKDelegationTokenSecretManager.java
@@ -106,10 +106,22 @@ protected Configuration getSecretConf(String connectString) {
   @SuppressWarnings("unchecked")
   @Test
   public void testMultiNodeOperations() throws Exception {
+      testMultiNodeOperationsImpl(false);
+  }
+
+  @Test
+  public void testMultiNodeOperationsWithZeroRetry() throws Exception {
+      testMultiNodeOperationsImpl(true);
+  }
+
+  public void testMultiNodeOperationsImpl(boolean setZeroRetry) throws Exception {
     for (int i = 0; i < TEST_RETRIES; i++) {
       DelegationTokenManager tm1, tm2 = null;
       String connectString = zkServer.getConnectString();
       Configuration conf = getSecretConf(connectString);
+      if (setZeroRetry) {
+          conf.setInt(ZKDelegationTokenSecretManager.ZK_DTSM_ZK_NUM_RETRIES, 0);
+      }
       tm1 = new DelegationTokenManager(conf, new Text("bla"));
       tm1.init();
       tm2 = new DelegationTokenManager(conf, new Text("bla"));