From e9370e3fad539c5efafd90f74db12b1dcfbc001d Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Mon, 25 Jul 2022 19:06:56 +0800 Subject: [PATCH 1/9] Update ZKFailoverController.java --- .../main/java/org/apache/hadoop/ha/ZKFailoverController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java index 53e20e54fb697..8bdb52c4a314d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java @@ -185,7 +185,7 @@ public Integer run() { } }); } catch (RuntimeException rte) { - throw (Exception)rte.getCause(); + throw (Exception)rte; } } From 8eddcbfb46a872b319cff1c59c2b641851b08444 Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Tue, 26 Jul 2022 13:54:02 +0800 Subject: [PATCH 2/9] Update ZKFailoverController.java --- .../main/java/org/apache/hadoop/ha/ZKFailoverController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java index 8bdb52c4a314d..53e20e54fb697 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java @@ -185,7 +185,7 @@ public Integer run() { } }); } catch (RuntimeException rte) { - throw (Exception)rte; + throw (Exception)rte.getCause(); } } From f893ae93ec223e29846081b28af9babe6902902a Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Tue, 26 Jul 2022 14:00:43 +0800 Subject: [PATCH 3/9] Update UserGroupInformation.java --- .../org/apache/hadoop/security/UserGroupInformation.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index 99a3332500aad..4d572849bee0d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -21,6 +21,8 @@ import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_KERBEROS_MIN_SECONDS_BEFORE_RELOGIN_DEFAULT; import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_USER_GROUP_METRICS_PERCENTILES_INTERVALS; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_TOKEN_FILES; +import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_GROUPS_CACHE_SECS; +import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT; import static org.apache.hadoop.security.UGIExceptionMessages.*; import static org.apache.hadoop.util.PlatformName.IBM_JAVA; @@ -304,6 +306,11 @@ private static void ensureInitialized() { private static synchronized void initialize(Configuration conf, boolean overrideNameRules) { authenticationMethod = SecurityUtil.getAuthenticationMethod(conf); + long cacheTimeout = conf.getLong(HADOOP_SECURITY_GROUPS_CACHE_SECS, HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT) * 1000; + if (cacheTimeout <=0 ){ + throw new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0", + new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0")); + } if (overrideNameRules || !HadoopKerberosName.hasRulesBeenSet()) { try { HadoopKerberosName.setConfiguration(conf); From eb92779fbf85117e65bfec1ebcffd503adf81cb0 Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Tue, 26 Jul 2022 16:07:53 +0800 Subject: [PATCH 4/9] Update UserGroupInformation.java --- .../java/org/apache/hadoop/security/UserGroupInformation.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index 4d572849bee0d..ecb5c1226ae15 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -308,8 +308,7 @@ private static synchronized void initialize(Configuration conf, authenticationMethod = SecurityUtil.getAuthenticationMethod(conf); long cacheTimeout = conf.getLong(HADOOP_SECURITY_GROUPS_CACHE_SECS, HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT) * 1000; if (cacheTimeout <=0 ){ - throw new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0", - new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0")); + throw new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0", new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0")); } if (overrideNameRules || !HadoopKerberosName.hasRulesBeenSet()) { try { From 2ebab6d208967bd8353fee6ba5240a061a13cfd3 Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Wed, 27 Jul 2022 11:32:37 +0800 Subject: [PATCH 5/9] Update UserGroupInformation.java --- .../org/apache/hadoop/security/UserGroupInformation.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index ecb5c1226ae15..25edb20545e49 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -306,9 +306,10 @@ private static void ensureInitialized() { private static synchronized void initialize(Configuration conf, boolean overrideNameRules) { authenticationMethod = SecurityUtil.getAuthenticationMethod(conf); - long cacheTimeout = conf.getLong(HADOOP_SECURITY_GROUPS_CACHE_SECS, HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT) * 1000; - if (cacheTimeout <=0 ){ - throw new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0", new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0")); + if (conf.getLong(HADOOP_SECURITY_GROUPS_CACHE_SECS, HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT) * 1000 <= 0){ + throw new IllegalArgumentException( + "hadoop.security.groups.cache.secs should be larger than 0", + new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0")); } if (overrideNameRules || !HadoopKerberosName.hasRulesBeenSet()) { try { From eebe175235edf3a2c46b3e85f488200f212a2784 Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Wed, 27 Jul 2022 11:33:29 +0800 Subject: [PATCH 6/9] Update TestUserGroupInformation.java --- .../org/apache/hadoop/security/TestUserGroupInformation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java index 2974f3e3a505e..58734b7479d11 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java @@ -7,6 +7,7 @@ * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 + * * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT From 31aa4f542e3bf8351bf7b922ba3ac32fca71d5c6 Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Wed, 27 Jul 2022 14:30:24 +0800 Subject: [PATCH 7/9] Update UserGroupInformation.java --- .../org/apache/hadoop/security/UserGroupInformation.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index 25edb20545e49..99a3332500aad 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -21,8 +21,6 @@ import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_KERBEROS_MIN_SECONDS_BEFORE_RELOGIN_DEFAULT; import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_USER_GROUP_METRICS_PERCENTILES_INTERVALS; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_TOKEN_FILES; -import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_GROUPS_CACHE_SECS; -import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT; import static org.apache.hadoop.security.UGIExceptionMessages.*; import static org.apache.hadoop.util.PlatformName.IBM_JAVA; @@ -306,11 +304,6 @@ private static void ensureInitialized() { private static synchronized void initialize(Configuration conf, boolean overrideNameRules) { authenticationMethod = SecurityUtil.getAuthenticationMethod(conf); - if (conf.getLong(HADOOP_SECURITY_GROUPS_CACHE_SECS, HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT) * 1000 <= 0){ - throw new IllegalArgumentException( - "hadoop.security.groups.cache.secs should be larger than 0", - new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0")); - } if (overrideNameRules || !HadoopKerberosName.hasRulesBeenSet()) { try { HadoopKerberosName.setConfiguration(conf); From 133fac4aa71ecbd760d0d727b13298e5e697c41d Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Wed, 27 Jul 2022 14:31:25 +0800 Subject: [PATCH 8/9] Update Groups.java --- .../src/main/java/org/apache/hadoop/security/Groups.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java index 57c3255794413..50c3893025a59 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java @@ -131,7 +131,11 @@ public Groups(Configuration conf, final Timer timer) { CommonConfigurationKeys. HADOOP_SECURITY_GROUPS_CACHE_BACKGROUND_RELOAD_THREADS_DEFAULT); parseStaticMapping(conf); - + if(cacheTimeout<=0){ + throw new IllegalArgumentException( + "hadoop.security.groups.cache.secs should be larger than 0", + new IllegalArgumentException("hadoop.security.groups.cache.secs should be larger than 0")); + } this.timer = timer; this.cache = CacheBuilder.newBuilder() .refreshAfterWrite(cacheTimeout, TimeUnit.MILLISECONDS) From 6dd2e39c128219d65dc74e6d99820f7d25d9dc39 Mon Sep 17 00:00:00 2001 From: falin luo <65234479+MEILIDEKCL@users.noreply.github.com> Date: Wed, 27 Jul 2022 14:42:03 +0800 Subject: [PATCH 9/9] Update Groups.java --- .../src/main/java/org/apache/hadoop/security/Groups.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java index 50c3893025a59..180c65c7b981b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java @@ -108,7 +108,6 @@ public Groups(Configuration conf, final Timer timer) { JniBasedUnixGroupsMappingWithFallback.class, GroupMappingServiceProvider.class), conf); - cacheTimeout = conf.getLong(CommonConfigurationKeys.HADOOP_SECURITY_GROUPS_CACHE_SECS, CommonConfigurationKeys.HADOOP_SECURITY_GROUPS_CACHE_SECS_DEFAULT) * 1000;