You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by iw...@apache.org on 2022/05/24 05:40:10 UTC
[hadoop] branch branch-2.10 updated: YARN-11162. Set the zk acl for nodes created by ZKConfigurationStore. (#4350)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 88a8752fa2b YARN-11162. Set the zk acl for nodes created by ZKConfigurationStore. (#4350)
88a8752fa2b is described below
commit 88a8752fa2ba0c70b0df94a78eb9fd86b965acd5
Author: Owen O'Malley <oo...@linkedin.com>
AuthorDate: Mon May 23 22:07:19 2022 -0700
YARN-11162. Set the zk acl for nodes created by ZKConfigurationStore. (#4350)
(cherry picked from commit f390edaec44cfa91b2b09549091f033f1749d8ac)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java
---
.../resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java | 4 ++--
1 file changed, 2 insertions(+), 2 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/scheduler/capacity/conf/ZKConfigurationStore.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/ZKConfigurationStore.java
index 09d9e2b9f28..15c5b700879 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/ZKConfigurationStore.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/ZKConfigurationStore.java
@@ -97,13 +97,13 @@ public class ZKConfigurationStore extends YarnConfigurationStore {
zkManager.delete(fencingNodePath);
if (!zkManager.exists(logsPath)) {
- zkManager.create(logsPath);
+ zkManager.create(logsPath, zkAcl);
zkManager.setData(logsPath,
serializeObject(new LinkedList<LogMutation>()), -1);
}
if (!zkManager.exists(confStorePath)) {
- zkManager.create(confStorePath);
+ zkManager.create(confStorePath, zkAcl);
HashMap<String, String> mapSchedConf = new HashMap<>();
for (Map.Entry<String, String> entry : schedConf) {
mapSchedConf.put(entry.getKey(), entry.getValue());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org