HADOOP-3513. Merge -r 665936:665937 from trunk to branch 0.18.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@665942 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -545,6 +545,8 @@ Release 0.18.0 - Unreleased
     HADOOP-3516. Ensure the JobClient in HadoopArchives is initialized
     with a configuration. (Subramaniam Krishnan via omalley)
 
+    HADOOP-3513. Improve NNThroughputBenchmark log messages. (shv)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java

@@ -463,6 +463,7 @@ public class NNThroughputBenchmark implements FSConstants {
       assert opsPerThread.length == numThreads : "Error opsPerThread.length"; 
       nameNode.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_LEAVE);
       // int generatedFileIdx = 0;
+      LOG.info("Generate " + numOpsRequired + " intputs for " + getOpName());
       fileNames = new String[numThreads][];
       for(int idx=0; idx < numThreads; idx++) {
         int threadOps = opsPerThread[idx];
@@ -536,6 +537,7 @@ public class NNThroughputBenchmark implements FSConstants {
               "-filesPerDir", String.valueOf(nameGenerator.filesPerDirectory)};
       CreateFileStats opCreate =  new CreateFileStats(createArgs);
       opCreate.benchmark();
+      LOG.info("Created " + numOpsRequired + " files.");
       nameNode.rename(opCreate.getBaseDir(), getBaseDir());
       // use the same files for open
       super.generateInputs(opsPerThread);
@@ -608,7 +610,7 @@ public class NNThroughputBenchmark implements FSConstants {
       DatanodeCommand cmd = nameNode.sendHeartbeat(
           dnRegistration, DF_CAPACITY, DF_USED, DF_CAPACITY - DF_USED, 0, 0);
       if(cmd != null)
-        LOG.info("sendHeartbeat Name-node reply: " + cmd.getAction());
+        LOG.debug("sendHeartbeat Name-node reply: " + cmd.getAction());
     }
 
     boolean addBlock(Block blk) {
@@ -765,9 +767,11 @@ public class NNThroughputBenchmark implements FSConstants {
       } while (numResolved != nrDatanodes);
 
       // create files 
+      LOG.info("Creating " + nrFiles + " with " + blocksPerFile + " blocks each.");
       FileGenerator nameGenerator;
       nameGenerator = new FileGenerator(getBaseDir(), 100);
       String clientName = getClientName(007);
+      nameNode.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_LEAVE);
       for(int idx=0; idx < nrFiles; idx++) {
         String fileName = nameGenerator.getNextFileName();
         nameNode.create(fileName, FsPermission.getDefault(),