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

HADOOP-14938. Configuration.updatingResource map should be initialized lazily (misha@cloudera.com via rkanter)

Browse Source
This commit is contained in:
Robert Kanter 2017-10-16 16:39:25 -07:00
parent 6971699099
commit a9cbfb0398
1 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -278,9 +278,9 @@ public String toString() {
/** /**
* Stores the mapping of key to the resource which modifies or loads * 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. * Specify exact input factory to avoid time finding correct one.
@ -737,7 +737,6 @@ public Configuration() {
*/ */
public Configuration(boolean loadDefaults) { public Configuration(boolean loadDefaults) {
this.loadDefaults = loadDefaults; this.loadDefaults = loadDefaults;
updatingResource = new ConcurrentHashMap<String, String[]>();
synchronized(Configuration.class) { synchronized(Configuration.class) {
REGISTRY.put(this, null); REGISTRY.put(this, null);
} }
@ -750,22 +749,24 @@ public Configuration(boolean loadDefaults) {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Configuration(Configuration other) { public Configuration(Configuration other) {
this.resources = (ArrayList<Resource>) other.resources.clone(); this.resources = (ArrayList<Resource>) other.resources.clone();
synchronized(other) { synchronized(other) {
if (other.properties != null) { if (other.properties != null) {
this.properties = (Properties)other.properties.clone(); this.properties = (Properties)other.properties.clone();
} }
if (other.overlay!=null) { if (other.overlay!=null) {
this.overlay = (Properties)other.overlay.clone(); this.overlay = (Properties)other.overlay.clone();
} }
this.updatingResource = new ConcurrentHashMap<String, String[]>( if (other.updatingResource != null) {
other.updatingResource); this.updatingResource = new ConcurrentHashMap<String, String[]>(
this.finalParameters = Collections.newSetFromMap( other.updatingResource);
new ConcurrentHashMap<String, Boolean>()); }
this.finalParameters.addAll(other.finalParameters); this.finalParameters = Collections.newSetFromMap(
} new ConcurrentHashMap<String, Boolean>());
this.finalParameters.addAll(other.finalParameters);
}
synchronized(Configuration.class) { synchronized(Configuration.class) {
REGISTRY.put(this, null); REGISTRY.put(this, null);
@ -1257,14 +1258,14 @@ public void set(String name, String value, String source) {
String newSource = (source == null ? "programmatically" : source); String newSource = (source == null ? "programmatically" : source);
if (!isDeprecated(name)) { if (!isDeprecated(name)) {
updatingResource.put(name, new String[] {newSource}); putIntoUpdatingResource(name, new String[] {newSource});
String[] altNames = getAlternativeNames(name); String[] altNames = getAlternativeNames(name);
if(altNames != null) { if(altNames != null) {
for(String n: altNames) { for(String n: altNames) {
if(!n.equals(name)) { if(!n.equals(name)) {
getOverlay().setProperty(n, value); getOverlay().setProperty(n, value);
getProps().setProperty(n, value); getProps().setProperty(n, value);
updatingResource.put(n, new String[] {newSource}); putIntoUpdatingResource(n, new String[] {newSource});
} }
} }
} }
@ -1275,7 +1276,7 @@ public void set(String name, String value, String source) {
for(String n : names) { for(String n : names) {
getOverlay().setProperty(n, value); getOverlay().setProperty(n, value);
getProps().setProperty(n, value); getProps().setProperty(n, value);
updatingResource.put(n, new String[] {altSource}); putIntoUpdatingResource(n, new String[] {altSource});
} }
} }
} }
@ -2614,17 +2615,19 @@ public Set<String> getFinalParameters() {
protected synchronized Properties getProps() { protected synchronized Properties getProps() {
if (properties == null) { if (properties == null) {
properties = new Properties(); properties = new Properties();
Map<String, String[]> backup = Map<String, String[]> backup = updatingResource != null ?
new ConcurrentHashMap<String, String[]>(updatingResource); new ConcurrentHashMap<String, String[]>(updatingResource) : null;
loadResources(properties, resources, quietmode); loadResources(properties, resources, quietmode);
if (overlay != null) { if (overlay != null) {
properties.putAll(overlay); properties.putAll(overlay);
for (Map.Entry<Object,Object> item: overlay.entrySet()) { if (backup != null) {
String key = (String)item.getKey(); for (Map.Entry<Object, Object> item : overlay.entrySet()) {
String[] source = backup.get(key); String key = (String) item.getKey();
if(source != null) { String[] source = backup.get(key);
updatingResource.put(key, source); if (source != null) {
updatingResource.put(key, source);
}
} }
} }
} }
@ -2979,8 +2982,8 @@ private void loadProperty(Properties properties, String name, String attr,
} }
if (!finalParameters.contains(attr)) { if (!finalParameters.contains(attr)) {
properties.setProperty(attr, value); properties.setProperty(attr, value);
if(source != null) { if (source != null) {
updatingResource.put(attr, source); putIntoUpdatingResource(attr, source);
} }
} else { } else {
// This is a final parameter so check for overrides. // This is a final parameter so check for overrides.
@ -3285,9 +3288,10 @@ private static void appendJSONProperty(JsonGenerator jsonGen,
redactor.redact(name, config.get(name))); redactor.redact(name, config.get(name)));
jsonGen.writeBooleanField("isFinal", jsonGen.writeBooleanField("isFinal",
config.finalParameters.contains(name)); config.finalParameters.contains(name));
String[] resources = config.updatingResource.get(name); String[] resources = config.updatingResource != null ?
config.updatingResource.get(name) : null;
String resource = UNKNOWN_RESOURCE; String resource = UNKNOWN_RESOURCE;
if(resources != null && resources.length > 0) { if (resources != null && resources.length > 0) {
resource = resources[0]; resource = resources[0];
} }
jsonGen.writeStringField("resource", resource); jsonGen.writeStringField("resource", resource);
@ -3367,8 +3371,8 @@ public void readFields(DataInput in) throws IOException {
String value = org.apache.hadoop.io.Text.readString(in); String value = org.apache.hadoop.io.Text.readString(in);
set(key, value); set(key, value);
String sources[] = WritableUtils.readCompressedStringArray(in); String sources[] = WritableUtils.readCompressedStringArray(in);
if(sources != null) { if (sources != null) {
updatingResource.put(key, sources); putIntoUpdatingResource(key, sources);
} }
} }
} }
@ -3381,8 +3385,8 @@ public void write(DataOutput out) throws IOException {
for(Map.Entry<Object, Object> item: props.entrySet()) { 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.getKey());
org.apache.hadoop.io.Text.writeString(out, (String) item.getValue()); org.apache.hadoop.io.Text.writeString(out, (String) item.getValue());
WritableUtils.writeCompressedStringArray(out, WritableUtils.writeCompressedStringArray(out, updatingResource != null ?
updatingResource.get(item.getKey())); updatingResource.get(item.getKey()) : null);
} }
} }
@ -3441,4 +3445,17 @@ public static boolean hasWarnedDeprecation(String name) {
} }
return false; return false;
} }
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);
}
} }