This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2736f8856144 YARN.11590. RM process stuck after calling
confStore.format() when ZK SSL/TLS is enabled, as netty thread waits
indefinitely. Contributed by Ferenc Erdelyi
2736f8856144 is described below
commit 2736f8856144c8361be3821cd1c158ef2d9a2dec
Author: Szilard Nemeth <snem...@apache.org>
AuthorDate: Mon Oct 16 15:17:58 2023 -0400
YARN.11590. RM process stuck after calling confStore.format() when ZK
SSL/TLS is enabled, as netty thread waits indefinitely. Contributed by Ferenc
Erdelyi
---
.../hadoop/yarn/server/resourcemanager/ResourceManager.java | 9 +++++----
.../scheduler/capacity/conf/YarnConfigurationStore.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 90eaed3d8a02..f358a22cee71 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -1903,10 +1903,11 @@ public class ResourceManager extends CompositeService
}
if (scheduler instanceof MutableConfScheduler && isConfigurationMutable) {
- YarnConfigurationStore confStore = YarnConfigurationStoreFactory
- .getStore(conf);
- confStore.initialize(conf, conf, rmContext);
- confStore.format();
+ try (YarnConfigurationStore confStore = YarnConfigurationStoreFactory
+ .getStore(conf)) {
+ confStore.initialize(conf, conf, rmContext);
+ confStore.format();
+ }
} else {
System.out.println(String.format("Scheduler Configuration format only " +
"supported by %s.", MutableConfScheduler.class.getSimpleName()));
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java
index 0f44f439056b..2ec2ea442a64 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java
@@ -44,7 +44,7 @@ import java.util.Map;
* {@code getPendingMutations}, and replay/confirm them via
* {@code confirmMutation} as in the normal case.
*/
-public abstract class YarnConfigurationStore {
+public abstract class YarnConfigurationStore implements AutoCloseable {
public static final Logger LOG =
LoggerFactory.getLogger(YarnConfigurationStore.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
