From 9faa39213ee73a74069b79be3b54e838bd255478 Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Mon, 26 Aug 2019 22:30:00 +0530 Subject: [PATCH] YARN-9775. Fix ZKConfigurationStore#retrieve to not load default configs. --- .../resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java | 2 +- .../scheduler/capacity/conf/TestZKConfigurationStore.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 c4e06cb..34c73ec 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 @@ -196,7 +196,7 @@ public synchronized Configuration retrieve() { try { Map map = (HashMap) deserializeObject(serializedSchedConf); - Configuration c = new Configuration(); + Configuration c = new Configuration(false); for (Map.Entry e : map.entrySet()) { c.set(e.getKey(), e.getValue()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java index ebac871..c09ae28 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java @@ -117,6 +117,8 @@ public void testPersistConfiguration() throws Exception { confStore.initialize(conf, schedConf, rmContext); assertEquals("val", confStore.retrieve().get("key")); + assertNull(confStore.retrieve().get(YarnConfiguration.RM_HOSTNAME)); + // Create a new configuration store, and check for old configuration confStore = createConfStore(); schedConf.set("key", "badVal"); -- 2.7.4 (Apple Git-66)