HADOOP-6875. svn merge -c 967220 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@967222 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1587,6 +1587,9 @@ Release 0.21.0 - 2010-07-01
     HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include
     aspect files. (Konstantin Boudnik)
 
+    HADOOP-6875. [Herriot] Cleanup of temp. configurations is needed upon
+    restart of a cluster (Vinay Thota via cos)
+
 Release 0.20.3 - Unreleased
 
   NEW FEATURES

src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java

@@ -389,6 +389,17 @@ public abstract class AbstractDaemonCluster {
     waitForClusterToStop();
     start();
     waitForClusterToStart();
+    cleanupNewConf(newConfDir);
+  }
+
+  /**
+   * It uses to delete the new configuration folder.
+   * @param path - configuration directory path.
+   * @throws IOException if an I/O error occurs.
+   */
+  public void cleanupNewConf(String path) throws IOException {
+    File file = new File(path);
+    file.delete();
   }
   
   /**