Skip to content

HDDS-5035. Use default config values to solve generated config file conflict #2087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elek merged 8 commits into from
Apr 6, 2021
Merged

HDDS-5035. Use default config values to solve generated config file conflict #2087

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f270d33
HDDS-5035. Use default config values to solve generated config file c…
symious Mar 28, 2021
37f7a10
trigger new CI check
symious Mar 28, 2021
ccda50f
HDDS_5035. Remove notes
symious Mar 29, 2021
1981b42
trigger new CI check
symious Mar 30, 2021
fa593d4
HDDS-5035. Add unit test to simulate the overwrite case
symious Mar 31, 2021
606533c
HDDS-5035. Remove unused variables
symious Mar 31, 2021
9281112
HDDS-5035. Remove unused import
symious Mar 31, 2021
b8d62e8
trigger new CI check
symious Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions ...op-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationReflectionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,35 +68,40 @@ public static <T> void injectConfigurationToObject(ConfigurationSource from,

String key = prefix + "." + configAnnotation.key();

String defaultValue = configAnnotation.defaultValue();

ConfigType type = configAnnotation.type();

if (type == ConfigType.AUTO) {
type = detectConfigType(field.getType(), fieldLocation);
}

//Note: default value is handled by ozone-default.xml. Here we can
//use any default.
try {
switch (type) {
case STRING:
forcedFieldSet(field, configuration, from.get(key));
forcedFieldSet(field, configuration, from.get(key, defaultValue));
break;
case INT:
forcedFieldSet(field, configuration, from.getInt(key, 0));
forcedFieldSet(field, configuration,
from.getInt(key, Integer.parseInt(defaultValue)));
break;
case BOOLEAN:
forcedFieldSet(field, configuration, from.getBoolean(key, false));
forcedFieldSet(field, configuration,
from.getBoolean(key, Boolean.parseBoolean(defaultValue)));
break;
case LONG:
forcedFieldSet(field, configuration, from.getLong(key, 0));
forcedFieldSet(field, configuration,
from.getLong(key, Long.parseLong(defaultValue)));
break;
case TIME:
forcedFieldSet(field, configuration,
from.getTimeDuration(key, "0s", configAnnotation.timeUnit()));
from.getTimeDuration(key, defaultValue,
configAnnotation.timeUnit()));
break;
case SIZE:
final long value =
Math.round(from.getStorageSize(key, "0b", StorageUnit.BYTES));
Math.round(from.getStorageSize(key,
defaultValue, StorageUnit.BYTES));
if (field.getType() == int.class) {
forcedFieldSet(field, configuration, (int) value);
} else {
Expand All @@ -106,13 +111,13 @@ public static <T> void injectConfigurationToObject(ConfigurationSource from,
break;
case CLASS:
forcedFieldSet(field, configuration,
from.getClass(key, Object.class));
from.getClass(key, Class.forName(defaultValue)));
break;
default:
throw new ConfigurationException(
"Unsupported ConfigType " + type + " on " + fieldLocation);
}
} catch (IllegalAccessException e) {
} catch (IllegalAccessException | ClassNotFoundException e) {
throw new ConfigurationException(
"Can't inject configuration to " + fieldLocation, e);
}
Expand Down