HADOOP-14938. Configuration.updatingResource map should be initialized lazily (misha@cloudera.com via rkanter)
This commit is contained in:
parent
7a27c2c367
commit
e163f41850
|
@ -290,9 +290,9 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
|
||||
/**
|
||||
* Stores the mapping of key to the resource which modifies or loads
|
||||
* the key most recently
|
||||
* the key most recently. Created lazily to avoid wasting memory.
|
||||
*/
|
||||
private Map<String, String[]> updatingResource;
|
||||
private volatile Map<String, String[]> updatingResource;
|
||||
|
||||
/**
|
||||
* Specify exact input factory to avoid time finding correct one.
|
||||
|
@ -749,7 +749,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
*/
|
||||
public Configuration(boolean loadDefaults) {
|
||||
this.loadDefaults = loadDefaults;
|
||||
updatingResource = new ConcurrentHashMap<String, String[]>();
|
||||
|
||||
// Register all classes holding property tags with
|
||||
REGISTERED_TAG_CLASS.put("core", CorePropertyTag.class);
|
||||
|
@ -778,8 +777,10 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
this.overlay = (Properties)other.overlay.clone();
|
||||
}
|
||||
|
||||
if (other.updatingResource != null) {
|
||||
this.updatingResource = new ConcurrentHashMap<String, String[]>(
|
||||
other.updatingResource);
|
||||
}
|
||||
this.finalParameters = Collections.newSetFromMap(
|
||||
new ConcurrentHashMap<String, Boolean>());
|
||||
this.finalParameters.addAll(other.finalParameters);
|
||||
|
@ -1277,14 +1278,14 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
String newSource = (source == null ? "programmatically" : source);
|
||||
|
||||
if (!isDeprecated(name)) {
|
||||
updatingResource.put(name, new String[] {newSource});
|
||||
putIntoUpdatingResource(name, new String[] {newSource});
|
||||
String[] altNames = getAlternativeNames(name);
|
||||
if(altNames != null) {
|
||||
for(String n: altNames) {
|
||||
if(!n.equals(name)) {
|
||||
getOverlay().setProperty(n, value);
|
||||
getProps().setProperty(n, value);
|
||||
updatingResource.put(n, new String[] {newSource});
|
||||
putIntoUpdatingResource(n, new String[] {newSource});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1295,7 +1296,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
for(String n : names) {
|
||||
getOverlay().setProperty(n, value);
|
||||
getProps().setProperty(n, value);
|
||||
updatingResource.put(n, new String[] {altSource});
|
||||
putIntoUpdatingResource(n, new String[] {altSource});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2634,12 +2635,13 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
protected synchronized Properties getProps() {
|
||||
if (properties == null) {
|
||||
properties = new Properties();
|
||||
Map<String, String[]> backup =
|
||||
new ConcurrentHashMap<String, String[]>(updatingResource);
|
||||
Map<String, String[]> backup = updatingResource != null ?
|
||||
new ConcurrentHashMap<String, String[]>(updatingResource) : null;
|
||||
loadResources(properties, resources, quietmode);
|
||||
|
||||
if (overlay != null) {
|
||||
properties.putAll(overlay);
|
||||
if (backup != null) {
|
||||
for (Map.Entry<Object, Object> item : overlay.entrySet()) {
|
||||
String key = (String) item.getKey();
|
||||
String[] source = backup.get(key);
|
||||
|
@ -2649,6 +2651,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return properties;
|
||||
}
|
||||
|
||||
|
@ -3061,7 +3064,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
if (!finalParameters.contains(attr)) {
|
||||
properties.setProperty(attr, value);
|
||||
if (source != null) {
|
||||
updatingResource.put(attr, source);
|
||||
putIntoUpdatingResource(attr, source);
|
||||
}
|
||||
} else {
|
||||
// This is a final parameter so check for overrides.
|
||||
|
@ -3366,7 +3369,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
redactor.redact(name, config.get(name)));
|
||||
jsonGen.writeBooleanField("isFinal",
|
||||
config.finalParameters.contains(name));
|
||||
String[] resources = config.updatingResource.get(name);
|
||||
String[] resources = config.updatingResource != null ?
|
||||
config.updatingResource.get(name) : null;
|
||||
String resource = UNKNOWN_RESOURCE;
|
||||
if (resources != null && resources.length > 0) {
|
||||
resource = resources[0];
|
||||
|
@ -3449,7 +3453,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
set(key, value);
|
||||
String sources[] = WritableUtils.readCompressedStringArray(in);
|
||||
if (sources != null) {
|
||||
updatingResource.put(key, sources);
|
||||
putIntoUpdatingResource(key, sources);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3462,8 +3466,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
for(Map.Entry<Object, Object> item: props.entrySet()) {
|
||||
org.apache.hadoop.io.Text.writeString(out, (String) item.getKey());
|
||||
org.apache.hadoop.io.Text.writeString(out, (String) item.getValue());
|
||||
WritableUtils.writeCompressedStringArray(out,
|
||||
updatingResource.get(item.getKey()));
|
||||
WritableUtils.writeCompressedStringArray(out, updatingResource != null ?
|
||||
updatingResource.get(item.getKey()) : null);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3563,4 +3567,17 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
}
|
||||
return tag;
|
||||
}
|
||||
|
||||
private void putIntoUpdatingResource(String key, String[] value) {
|
||||
Map<String, String[]> localUR = updatingResource;
|
||||
if (localUR == null) {
|
||||
synchronized (this) {
|
||||
localUR = updatingResource;
|
||||
if (localUR == null) {
|
||||
updatingResource = localUR = new ConcurrentHashMap<>(8);
|
||||
}
|
||||
}
|
||||
}
|
||||
localUR.put(key, value);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue