You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2011/01/04 23:12:22 UTC
svn commit: r1055206 - in /hadoop/common/trunk: CHANGES.txt
src/java/org/apache/hadoop/conf/Configuration.java
Author: todd
Date: Tue Jan 4 22:12:22 2011
New Revision: 1055206
URL: http://svn.apache.org/viewvc?rev=1055206&view=rev
Log:
HADOOP-7082. Configuration.writeXML should not hold lock while outputting. Contributed by Todd Lipcon
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1055206&r1=1055205&r2=1055206&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Jan 4 22:12:22 2011
@@ -413,6 +413,9 @@ Release 0.22.0 - Unreleased
HADOOP-7038. saveVersion script includes an additional \r while running
whoami under windows. (Wang Xu via cos)
+ HADOOP-7082. Configuration.writeXML should not hold lock while outputting
+ (todd)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java?rev=1055206&r1=1055205&r2=1055206&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/conf/Configuration.java Tue Jan 4 22:12:22 2011
@@ -1588,52 +1588,67 @@ public class Configuration implements It
*
* @param out the writer to write to.
*/
- public synchronized void writeXml(Writer out) throws IOException {
+ public void writeXml(Writer out) throws IOException {
+ Document doc = asXmlDocument();
+
Properties properties = getProps();
try {
- Document doc =
- DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Element conf = doc.createElement("configuration");
- doc.appendChild(conf);
- conf.appendChild(doc.createTextNode("\n"));
- for (Enumeration e = properties.keys(); e.hasMoreElements();) {
- String name = (String)e.nextElement();
- Object object = properties.get(name);
- String value = null;
- if (object instanceof String) {
- value = (String) object;
- }else {
- continue;
- }
- Element propNode = doc.createElement("property");
- conf.appendChild(propNode);
-
- if (updatingResource != null) {
- Comment commentNode = doc.createComment(
- "Loaded from " + updatingResource.get(name));
- propNode.appendChild(commentNode);
- }
- Element nameNode = doc.createElement("name");
- nameNode.appendChild(doc.createTextNode(name));
- propNode.appendChild(nameNode);
-
- Element valueNode = doc.createElement("value");
- valueNode.appendChild(doc.createTextNode(value));
- propNode.appendChild(valueNode);
-
- conf.appendChild(doc.createTextNode("\n"));
- }
-
DOMSource source = new DOMSource(doc);
StreamResult result = new StreamResult(out);
TransformerFactory transFactory = TransformerFactory.newInstance();
Transformer transformer = transFactory.newTransformer();
+
+ // Important to not hold Configuration log while writing result, since
+ // 'out' may be an HDFS stream which needs to lock this configuration
+ // from another thread.
transformer.transform(source, result);
} catch (TransformerException te) {
throw new IOException(te);
+ }
+ }
+
+ /**
+ * Return the XML DOM corresponding to this Configuration.
+ */
+ private synchronized Document asXmlDocument() throws IOException {
+ Document doc;
+ try {
+ doc =
+ DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
} catch (ParserConfigurationException pe) {
throw new IOException(pe);
}
+ Element conf = doc.createElement("configuration");
+ doc.appendChild(conf);
+ conf.appendChild(doc.createTextNode("\n"));
+ for (Enumeration e = properties.keys(); e.hasMoreElements();) {
+ String name = (String)e.nextElement();
+ Object object = properties.get(name);
+ String value = null;
+ if (object instanceof String) {
+ value = (String) object;
+ }else {
+ continue;
+ }
+ Element propNode = doc.createElement("property");
+ conf.appendChild(propNode);
+
+ if (updatingResource != null) {
+ Comment commentNode = doc.createComment(
+ "Loaded from " + updatingResource.get(name));
+ propNode.appendChild(commentNode);
+ }
+ Element nameNode = doc.createElement("name");
+ nameNode.appendChild(doc.createTextNode(name));
+ propNode.appendChild(nameNode);
+
+ Element valueNode = doc.createElement("value");
+ valueNode.appendChild(doc.createTextNode(value));
+ propNode.appendChild(valueNode);
+
+ conf.appendChild(doc.createTextNode("\n"));
+ }
+ return doc;
}
/**