Author: shv
Date: Mon Jun 9 17:26:52 2008
New Revision: 665937
URL: http://svn.apache.org/viewvc?rev=665937&view=rev
Log:
HADOOP-3513. Improve NNThroughputBenchmark log messages. Contributed by
Konstantin Shvachko.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=665937&r1=665936&r2=665937&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Jun 9 17:26:52 2008
@@ -556,6 +556,8 @@
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
Modified:
hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java?rev=665937&r1=665936&r2=665937&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java
(original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNThroughputBenchmark.java
Mon Jun 9 17:26:52 2008
@@ -463,6 +463,7 @@
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 @@
"-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 @@
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 @@
} 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(),