From 535e276b55dc36ea220708a71d4094c18669aa35 Mon Sep 17 00:00:00 2001
From: xiezhineng <xiezhineng@corp.netease.com>
Date: Fri, 11 Feb 2022 19:49:20 +0800
Subject: [PATCH 1/3] add `zk-dt-secret-manager.jute.maxbuffer` config

---
 .../token/delegation/ZKDelegationTokenSecretManager.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
index 5e5ea8cebc6f7..0b1cc0bd8a4d9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -98,6 +98,8 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
       + "kerberos.keytab";
   public static final String ZK_DTSM_ZK_KERBEROS_PRINCIPAL = ZK_CONF_PREFIX
       + "kerberos.principal";
+  public static final String ZK_DTSM_ZK_JUTE_MAXBUFFER = ZK_CONF_PREFIX
+          + "jute.maxbuffer";
   public static final String ZK_DTSM_TOKEN_SEQNUM_BATCH_SIZE = ZK_CONF_PREFIX
       + "token.seqnum.batch.size";
   public static final String ZK_DTSM_TOKEN_WATCHER_ENABLED = ZK_CONF_PREFIX
@@ -108,6 +110,7 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
   public static final int ZK_DTSM_ZK_SESSION_TIMEOUT_DEFAULT = 10000;
   public static final int ZK_DTSM_ZK_CONNECTION_TIMEOUT_DEFAULT = 10000;
   public static final int ZK_DTSM_ZK_SHUTDOWN_TIMEOUT_DEFAULT = 10000;
+  public static final String ZK_DTSM_ZK_JUTE_MAXBUFFER_DEFAULT = "20000000";
   public static final String ZK_DTSM_ZNODE_WORKING_PATH_DEAFULT = "zkdtsm";
   // by default it is still incrementing seq number by 1 each time
   public static final int ZK_DTSM_TOKEN_SEQNUM_BATCH_SIZE_DEFAULT = 1;
@@ -199,6 +202,10 @@ public ZKDelegationTokenSecretManager(Configuration conf) {
                 ZK_DTSM_ZK_SESSION_TIMEOUT_DEFAULT);
         int numRetries =
             conf.getInt(ZK_DTSM_ZK_NUM_RETRIES, ZK_DTSM_ZK_NUM_RETRIES_DEFAULT);
+        String juteMaxBuffer =
+                conf.get(ZK_DTSM_ZK_JUTE_MAXBUFFER, ZK_DTSM_ZK_JUTE_MAXBUFFER_DEFAULT);
+        System.setProperty(ZKClientConfig.JUTE_MAXBUFFER,
+                 juteMaxBuffer);
         builder =
             CuratorFrameworkFactory
                 .builder()

From a08a491f772f7a2be3b34429fbdcd2e8850f9a6f Mon Sep 17 00:00:00 2001
From: xiezhineng <xiezhineng@corp.netease.com>
Date: Tue, 15 Feb 2022 10:09:46 +0800
Subject: [PATCH 2/3] fix some checkstyle error

---
 .../token/delegation/ZKDelegationTokenSecretManager.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
index 0b1cc0bd8a4d9..f60f2c24c3592 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -203,9 +203,8 @@ public ZKDelegationTokenSecretManager(Configuration conf) {
         int numRetries =
             conf.getInt(ZK_DTSM_ZK_NUM_RETRIES, ZK_DTSM_ZK_NUM_RETRIES_DEFAULT);
         String juteMaxBuffer =
-                conf.get(ZK_DTSM_ZK_JUTE_MAXBUFFER, ZK_DTSM_ZK_JUTE_MAXBUFFER_DEFAULT);
-        System.setProperty(ZKClientConfig.JUTE_MAXBUFFER,
-                 juteMaxBuffer);
+            conf.get(ZK_DTSM_ZK_JUTE_MAXBUFFER, ZK_DTSM_ZK_JUTE_MAXBUFFER_DEFAULT);
+        System.setProperty(ZKClientConfig.JUTE_MAXBUFFER, juteMaxBuffer);
         builder =
             CuratorFrameworkFactory
                 .builder()

From e898cb2a0668e54069b1ba26401e570ad33f3302 Mon Sep 17 00:00:00 2001
From: xiezhineng <xiezhineng@corp.netease.com>
Date: Tue, 15 Feb 2022 10:11:53 +0800
Subject: [PATCH 3/3] fix some checkstyle error 2

---
 .../token/delegation/ZKDelegationTokenSecretManager.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
index f60f2c24c3592..af53aa5b1aefd 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -99,7 +99,7 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
   public static final String ZK_DTSM_ZK_KERBEROS_PRINCIPAL = ZK_CONF_PREFIX
       + "kerberos.principal";
   public static final String ZK_DTSM_ZK_JUTE_MAXBUFFER = ZK_CONF_PREFIX
-          + "jute.maxbuffer";
+      + "jute.maxbuffer";
   public static final String ZK_DTSM_TOKEN_SEQNUM_BATCH_SIZE = ZK_CONF_PREFIX
       + "token.seqnum.batch.size";
   public static final String ZK_DTSM_TOKEN_WATCHER_ENABLED = ZK_CONF_PREFIX