Author: szetszwo
Date: Fri May 22 00:07:18 2009
New Revision: 777330
URL: http://svn.apache.org/viewvc?rev=777330&view=rev
Log:
HADOOP-5867. Fix javac warnings found in NNBench and NNBenchWithoutMR.
Konstantin Boudnik
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBench.java
hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBenchWithoutMR.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=777330&r1=777329&r2=777330&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri May 22 00:07:18 2009
@@ -656,6 +656,9 @@
HADOOP-5687. NameNode throws NPE if fs.default.name is the default value.
(Philip Zeyliger via shv)
+ HADOOP-5867. Fix javac warnings found in NNBench and NNBenchWithoutMR.
+ (Konstantin Boudnik via szetszwo)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBench.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBench.java?rev=777330&r1=777329&r2=777330&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBench.java
(original)
+++ hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBench.java
Fri May 22 00:07:18 2009
@@ -156,7 +156,6 @@
if (writer != null) {
writer.close();
}
- writer = null;
}
}
}
@@ -210,6 +209,9 @@
/**
* check for arguments and fail if the values are not specified
+ * @param index positional number of an argument in the list of command
+ * line's arguments
+ * @param length total number of arguments
*/
public static void checkArgs(final int index, final int length) {
if (index == length) {
@@ -220,8 +222,8 @@
/**
* Parse input arguments
- *
- * @params args Command line inputs
+ *
+ * @param args array of command line's parameters to be parsed
*/
public static void parseInputs(final String[] args) {
// If there are no command line arguments, exit
@@ -358,8 +360,8 @@
// Average latency is the average time to perform 'n' number of
// operations, n being the number of files
- double avgLatency1 = (double) totalTimeAL1 / (double) successfulFileOps;
- double avgLatency2 = (double) totalTimeAL2 / (double) successfulFileOps;
+ double avgLatency1 = (double) totalTimeAL1 / successfulFileOps;
+ double avgLatency2 = (double) totalTimeAL2 / successfulFileOps;
// The time it takes for the longest running map is measured. Using that,
// cluster transactions per second is calculated. It includes time to
@@ -367,7 +369,7 @@
double longestMapTimeTPmS = (double) (mapEndTimeTPmS - mapStartTimeTPmS);
double totalTimeTPS = (longestMapTimeTPmS == 0) ?
(1000 * successfulFileOps) :
- (double) (1000 * successfulFileOps) / (double) longestMapTimeTPmS;
+ (double) (1000 * successfulFileOps) / longestMapTimeTPmS;
// The time it takes to perform 'n' operations is calculated (in ms),
// n being the number of files. Using that time, the average execution
@@ -375,22 +377,22 @@
// failed operations
double AverageExecutionTime = (totalTimeTPmS == 0) ?
(double) successfulFileOps :
- (double) (totalTimeTPmS / successfulFileOps);
+ (double) totalTimeTPmS / successfulFileOps;
if (operation.equals(OP_CREATE_WRITE)) {
// For create/write/close, it is treated as two transactions,
// since a file create from a client perspective involves create and
close
resultTPSLine1 = " TPS: Create/Write/Close: " +
(int) (totalTimeTPS * 2);
- resultTPSLine2 = "Avg exec time (ms): Create/Write/Close: " +
- (double) AverageExecutionTime;
+ resultTPSLine2 = "Avg exec time (ms): Create/Write/Close: " +
+ AverageExecutionTime;
resultALLine1 = " Avg Lat (ms): Create/Write: " + avgLatency1;
resultALLine2 = " Avg Lat (ms): Close: " + avgLatency2;
} else if (operation.equals(OP_OPEN_READ)) {
resultTPSLine1 = " TPS: Open/Read: " +
(int) totalTimeTPS;
resultTPSLine2 = " Avg Exec time (ms): Open/Read: " +
- (double) AverageExecutionTime;
+ AverageExecutionTime;
resultALLine1 = " Avg Lat (ms): Open: " + avgLatency1;
if (readFileAfterOpen) {
resultALLine2 = " Avg Lat (ms): Read: " + avgLatency2;
@@ -399,13 +401,13 @@
resultTPSLine1 = " TPS: Rename: " +
(int) totalTimeTPS;
resultTPSLine2 = " Avg Exec time (ms): Rename: " +
- (double) AverageExecutionTime;
+ AverageExecutionTime;
resultALLine1 = " Avg Lat (ms): Rename: " + avgLatency1;
} else if (operation.equals(OP_DELETE)) {
resultTPSLine1 = " TPS: Delete: " +
(int) totalTimeTPS;
resultTPSLine2 = " Avg Exec time (ms): Delete: " +
- (double) AverageExecutionTime;
+ AverageExecutionTime;
resultALLine1 = " Avg Lat (ms): Delete: " + avgLatency1;
}
@@ -558,6 +560,7 @@
/**
* Main method for running the NNBench benchmarks
*
+ * @param args array of command line arguments
* @throws IOException indicates a problem with test startup
*/
public static void main(String[] args) throws IOException {
@@ -587,7 +590,7 @@
/**
* Mapper class
*/
- static class NNBenchMapper extends Configured
+ static class NNBenchMapper extends Configured
implements Mapper<Text, LongWritable, Text, Text> {
FileSystem filesystem = null;
private String hostName = null;
@@ -639,13 +642,15 @@
*/
public void close() throws IOException {
}
-
+
/**
- * Returns when the current number of seconds from the epoch equals
- * the command line argument given by <code>-startTime</code>.
- * This allows multiple instances of this program, running on clock
- * synchronized nodes, to start at roughly the same time.
- */
+ * Returns when the current number of seconds from the epoch equals
+ * the command line argument given by <code>-startTime</code>.
+ * This allows multiple instances of this program, running on clock
+ * synchronized nodes, to start at roughly the same time.
+ * @return true if the method was able to sleep for <code>-startTime</code>
+ * without interruption; false otherwise
+ */
private boolean barrier() {
long startTime = getConf().getLong("test.nnbench.starttime", 0l);
long currentTime = System.currentTimeMillis();
@@ -698,16 +703,16 @@
if (barrier()) {
if (op.equals(OP_CREATE_WRITE)) {
startTimeTPmS = System.currentTimeMillis();
- doCreateWriteOp("file_" + hostName + "_", output, reporter);
+ doCreateWriteOp("file_" + hostName + "_", reporter);
} else if (op.equals(OP_OPEN_READ)) {
startTimeTPmS = System.currentTimeMillis();
- doOpenReadOp("file_" + hostName + "_", output, reporter);
+ doOpenReadOp("file_" + hostName + "_", reporter);
} else if (op.equals(OP_RENAME)) {
startTimeTPmS = System.currentTimeMillis();
- doRenameOp("file_" + hostName + "_", output, reporter);
+ doRenameOp("file_" + hostName + "_", reporter);
} else if (op.equals(OP_DELETE)) {
startTimeTPmS = System.currentTimeMillis();
- doDeleteOp("file_" + hostName + "_", output, reporter);
+ doDeleteOp("file_" + hostName + "_", reporter);
}
endTimeTPms = System.currentTimeMillis();
@@ -735,11 +740,13 @@
/**
* Create and Write operation.
+ * @param name of the prefix of the putput file to be created
+ * @param reporter an instanse of (@link Reporter) to be used for
+ * status' updates
*/
private void doCreateWriteOp(String name,
- OutputCollector<Text, Text> output,
- Reporter reporter) {
- FSDataOutputStream out = null;
+ Reporter reporter) {
+ FSDataOutputStream out;
byte[] buffer = new byte[bytesToWrite];
for (long l = 0l; l < numberOfFiles; l++) {
@@ -783,11 +790,13 @@
/**
* Open operation
+ * @param name of the prefix of the putput file to be read
+ * @param reporter an instanse of (@link Reporter) to be used for
+ * status' updates
*/
private void doOpenReadOp(String name,
- OutputCollector<Text, Text> output,
- Reporter reporter) {
- FSDataInputStream input = null;
+ Reporter reporter) {
+ FSDataInputStream input;
byte[] buffer = new byte[bytesToWrite];
for (long l = 0l; l < numberOfFiles; l++) {
@@ -824,10 +833,12 @@
/**
* Rename operation
+ * @param name of prefix of the file to be renamed
+ * @param reporter an instanse of (@link Reporter) to be used for
+ * status' updates
*/
private void doRenameOp(String name,
- OutputCollector<Text, Text> output,
- Reporter reporter) {
+ Reporter reporter) {
for (long l = 0l; l < numberOfFiles; l++) {
Path filePath = new Path(new Path(baseDir, dataDirName),
name + "_" + l);
@@ -857,10 +868,12 @@
/**
* Delete operation
+ * @param name of prefix of the file to be deleted
+ * @param reporter an instanse of (@link Reporter) to be used for
+ * status' updates
*/
private void doDeleteOp(String name,
- OutputCollector<Text, Text> output,
- Reporter reporter) {
+ Reporter reporter) {
for (long l = 0l; l < numberOfFiles; l++) {
Path filePath = new Path(new Path(baseDir, dataDirName),
name + "_" + l);
Modified:
hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBenchWithoutMR.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBenchWithoutMR.java?rev=777330&r1=777329&r2=777330&view=diff
==============================================================================
---
hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBenchWithoutMR.java
(original)
+++
hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/hdfs/NNBenchWithoutMR.java
Fri May 22 00:07:18 2009
@@ -28,8 +28,8 @@
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.mapred.JobConf;
/**
* This program executes a specified operation that applies load to
@@ -59,7 +59,6 @@
// variables initialized in main()
private static FileSystem fileSys = null;
private static Path taskDir = null;
- private static String uniqueId = null;
private static byte[] buffer;
private static long maxExceptionsPerFile = 200;
@@ -69,12 +68,14 @@
* This allows multiple instances of this program, running on clock
* synchronized nodes, to start at roughly the same time.
*/
+
static void barrier() {
long sleepTime;
while ((sleepTime = startTime - System.currentTimeMillis()) > 0) {
try {
Thread.sleep(sleepTime);
} catch (InterruptedException ex) {
+ //This left empty on purpose
}
}
}
@@ -98,18 +99,20 @@
static int createWrite() {
int totalExceptions = 0;
FSDataOutputStream out = null;
- boolean success = false;
+ boolean success;
for (int index = 0; index < numFiles; index++) {
int singleFileExceptions = 0;
do { // create file until is succeeds or max exceptions reached
try {
out = fileSys.create(
- new Path(taskDir, "" + index), false, 512,
(short)1, bytesPerBlock);
+ new Path(taskDir, "" + index), false, 512,
+ (short)1, bytesPerBlock);
success = true;
} catch (IOException ioe) {
success=false;
totalExceptions++;
- handleException("creating file #" + index, ioe,
++singleFileExceptions);
+ handleException("creating file #" + index, ioe,
+ ++singleFileExceptions);
}
} while (!success);
long toBeWritten = bytesPerFile;
@@ -120,7 +123,8 @@
out.write(buffer, 0, nbytes);
} catch (IOException ioe) {
totalExceptions++;
- handleException("writing to file #" + index, ioe,
++singleFileExceptions);
+ handleException("writing to file #" + index, ioe,
+ ++singleFileExceptions);
}
}
do { // close file until is succeeds
@@ -130,7 +134,8 @@
} catch (IOException ioe) {
success=false;
totalExceptions++;
- handleException("closing file #" + index, ioe,
++singleFileExceptions);
+ handleException("closing file #" + index, ioe,
+ ++singleFileExceptions);
}
} while (!success);
}
@@ -144,7 +149,7 @@
*/
static int openRead() {
int totalExceptions = 0;
- FSDataInputStream in = null;
+ FSDataInputStream in;
for (int index = 0; index < numFiles; index++) {
int singleFileExceptions = 0;
try {
@@ -153,11 +158,12 @@
while (toBeRead > 0) {
int nbytes = (int) Math.min(buffer.length, toBeRead);
toBeRead -= nbytes;
- try { // only try once
+ try { // only try once && we don't care about a number of bytes read
in.read(buffer, 0, nbytes);
} catch (IOException ioe) {
totalExceptions++;
- handleException("reading from file #" + index, ioe,
++singleFileExceptions);
+ handleException("reading from file #" + index, ioe,
+ ++singleFileExceptions);
}
}
in.close();
@@ -177,19 +183,23 @@
*/
static int rename() {
int totalExceptions = 0;
- boolean success = false;
+ boolean success;
for (int index = 0; index < numFiles; index++) {
int singleFileExceptions = 0;
do { // rename file until is succeeds
try {
- boolean result = fileSys.rename(
- new Path(taskDir, "" + index), new
Path(taskDir, "A" + index));
+ // Possible result of this operation is at no interest to us for it
+ // can return false only if the namesystem
+ // could rename the path from the name
+ // space (e.g. no Exception has been thrown)
+ fileSys.rename(new Path(taskDir, "" + index),
+ new Path(taskDir, "A" + index));
success = true;
- } catch (IOException ioe) {
- success=false;
+ } catch (IOException ioe) {
+ success = false;
totalExceptions++;
handleException("creating file #" + index, ioe,
++singleFileExceptions);
- }
+ }
} while (!success);
}
return totalExceptions;
@@ -203,14 +213,18 @@
*/
static int delete() {
int totalExceptions = 0;
- boolean success = false;
+ boolean success;
for (int index = 0; index < numFiles; index++) {
int singleFileExceptions = 0;
do { // delete file until is succeeds
try {
- boolean result = fileSys.delete(new Path(taskDir, "A" + index),
true);
+ // Possible result of this operation is at no interest to us for it
+ // can return false only if namesystem
+ // delete could remove the path from the name
+ // space (e.g. no Exception has been thrown)
+ fileSys.delete(new Path(taskDir, "A" + index), true);
success = true;
- } catch (IOException ioe) {
+ } catch (IOException ioe) {
success=false;
totalExceptions++;
handleException("creating file #" + index, ioe,
++singleFileExceptions);
@@ -239,6 +253,7 @@
* [-bytesPerChecksum <value for io.bytes.per.checksum>]
* </pre>
*
+ * @param args is an array of the program command line arguments
* @throws IOException indicates a problem with test startup
*/
public static void main(String[] args) throws IOException {
@@ -281,7 +296,7 @@
bytesPerFile = bytesPerBlock * blocksPerFile;
JobConf jobConf = new JobConf(new Configuration(), NNBench.class);
-
+
if ( bytesPerChecksum < 0 ) { // if it is not set in cmdline
bytesPerChecksum = jobConf.getInt("io.bytes.per.checksum", 512);
}
@@ -308,7 +323,7 @@
}
fileSys = FileSystem.get(jobConf);
- uniqueId = java.net.InetAddress.getLocalHost().getHostName();
+ String uniqueId = java.net.InetAddress.getLocalHost().getHostName();
taskDir = new Path(baseDir, uniqueId);
// initialize buffer used for writing/reading file
buffer = new byte[(int) Math.min(bytesPerFile, 32768L)];
