YARN-10580. Fix some issues in TestRMWebServicesCapacitySchedDynamicConfig. Contributed by Tamas Domok

This commit is contained in:
Szilard Nemeth 2022-02-17 19:17:31 +01:00
parent bb1135c77c
commit 48e02f7998

View File

@ -102,8 +102,6 @@ public void testSchedulerResponsePercentageMode()
throws Exception { throws Exception {
Configuration config = CSConfigGenerator Configuration config = CSConfigGenerator
.createPercentageConfig(); .createPercentageConfig();
config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
YarnConfiguration.MEMORY_CONFIGURATION_STORE);
initResourceManager(config); initResourceManager(config);
@ -121,8 +119,6 @@ public void testSchedulerResponsePercentageModeLegacyAutoCreation()
throws Exception { throws Exception {
Configuration config = CSConfigGenerator Configuration config = CSConfigGenerator
.createPercentageConfigLegacyAutoCreation(); .createPercentageConfigLegacyAutoCreation();
config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
YarnConfiguration.MEMORY_CONFIGURATION_STORE);
initResourceManager(config); initResourceManager(config);
@ -141,8 +137,6 @@ public void testSchedulerResponseAbsoluteModeLegacyAutoCreation()
throws Exception { throws Exception {
Configuration config = CSConfigGenerator Configuration config = CSConfigGenerator
.createAbsoluteConfigLegacyAutoCreation(); .createAbsoluteConfigLegacyAutoCreation();
config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
YarnConfiguration.MEMORY_CONFIGURATION_STORE);
initResourceManager(config); initResourceManager(config);
initAutoQueueHandler(8192 * GB); initAutoQueueHandler(8192 * GB);
@ -157,8 +151,6 @@ public void testSchedulerResponseAbsoluteMode()
throws Exception { throws Exception {
Configuration config = CSConfigGenerator Configuration config = CSConfigGenerator
.createAbsoluteConfig(); .createAbsoluteConfig();
config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
YarnConfiguration.MEMORY_CONFIGURATION_STORE);
initResourceManager(config); initResourceManager(config);
@ -176,8 +168,6 @@ public void testSchedulerResponseWeightMode()
throws Exception { throws Exception {
Configuration config = CSConfigGenerator Configuration config = CSConfigGenerator
.createWeightConfig(); .createWeightConfig();
config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
YarnConfiguration.MEMORY_CONFIGURATION_STORE);
initResourceManager(config); initResourceManager(config);
@ -197,8 +187,6 @@ public void testSchedulerResponseWeightModeWithAutoCreatedQueues()
throws Exception { throws Exception {
Configuration config = CSConfigGenerator Configuration config = CSConfigGenerator
.createWeightConfigWithAutoQueueCreationEnabled(); .createWeightConfigWithAutoQueueCreationEnabled();
config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
YarnConfiguration.MEMORY_CONFIGURATION_STORE);
config.setInt(CapacitySchedulerConfiguration config.setInt(CapacitySchedulerConfiguration
.getQueuePrefix("root.autoParent1") + .getQueuePrefix("root.autoParent1") +
AutoCreatedQueueTemplate.AUTO_QUEUE_TEMPLATE_PREFIX + AutoCreatedQueueTemplate.AUTO_QUEUE_TEMPLATE_PREFIX +
@ -332,6 +320,10 @@ public static Configuration createConfiguration(
for (Map.Entry<String, String> entry : configs.entrySet()) { for (Map.Entry<String, String> entry : configs.entrySet()) {
config.set(entry.getKey(), entry.getValue()); config.set(entry.getKey(), entry.getValue());
} }
config.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
YarnConfiguration.MEMORY_CONFIGURATION_STORE);
return config; return config;
} }
} }