Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-9775. RMWebServices /scheduler-conf GET returns all hadoop configurations for ZKConfigurationStore. Contributed by Prabhu Joseph

Browse Source 
(cherry picked from commit 8660e48ca15098e891c560beb3181c22ef3f80ff)
(cherry picked from commit e4249c320257586384035ea3fc286fe54cc699a1)
This commit is contained in:
Jonathan Hung 2019-08-26 15:45:13 -07:00
parent eb618e4f22
commit 6baa0d1e4d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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
View File

@ -196,7 +196,7 @@ public synchronized Configuration retrieve() {
try { try {
Map<String, String> map = Map<String, String> map =
(HashMap<String, String>) deserializeObject(serializedSchedConf); (HashMap<String, String>) deserializeObject(serializedSchedConf);
Configuration c = new Configuration(); Configuration c = new Configuration(false);
for (Map.Entry<String, String> e : map.entrySet()) { for (Map.Entry<String, String> e : map.entrySet()) {
c.set(e.getKey(), e.getValue()); c.set(e.getKey(), e.getValue());
} }

2
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
View File

@ -117,6 +117,8 @@ public void testPersistConfiguration() throws Exception {
confStore.initialize(conf, schedConf, rmContext); confStore.initialize(conf, schedConf, rmContext);
assertEquals("val", confStore.retrieve().get("key")); assertEquals("val", confStore.retrieve().get("key"));
assertNull(confStore.retrieve().get(YarnConfiguration.RM_HOSTNAME));
// Create a new configuration store, and check for old configuration // Create a new configuration store, and check for old configuration
confStore = createConfStore(); confStore = createConfStore();
schedConf.set("key", "badVal"); schedConf.set("key", "badVal");