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 sz...@apache.org on 2009/05/27 22:48:18 UTC
svn commit: r779308 - in /hadoop/core/trunk: CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
Author: szetszwo
Date: Wed May 27 20:48:18 2009
New Revision: 779308
URL: http://svn.apache.org/viewvc?rev=779308&view=rev
Log:
HADOOP-5856. Fix "unsafe multithreaded use of DateFormat" findbugs warning in DataBlockScanner. Contributed by Kan Zhang
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=779308&r1=779307&r2=779308&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed May 27 20:48:18 2009
@@ -700,6 +700,9 @@
HADOOP-5700. INode.getPathComponents throws NPE when given a non-absolute
path. (Todd Lipcon via tomwhite)
+ HADOOP-5856. Fix "unsafe multithreaded use of DateFormat" findbugs warning
+ in DataBlockScanner. (Kan Zhang via szetszwo)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java?rev=779308&r1=779307&r2=779308&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java Wed May 27 20:48:18 2009
@@ -346,7 +346,10 @@
info.lastLogTime = now;
LogFileHandler log = verificationLog;
if (log != null) {
- log.appendLine(LogEntry.newEnry(block, now));
+ log.appendLine("date=\"" + dateFormat.format(new Date(now)) + "\"\t " +
+ "time=\"" + now + "\"\t " +
+ "genstamp=\"" + block.getGenerationStamp() + "\"\t " +
+ "id=\"" + block.getBlockId() +"\"");
}
}
@@ -381,13 +384,6 @@
private static Pattern entryPattern =
Pattern.compile("\\G\\s*([^=\\p{Space}]+)=\"(.*?)\"\\s*");
- static String newEnry(Block block, long time) {
- return "date=\"" + dateFormat.format(new Date(time)) + "\"\t " +
- "time=\"" + time + "\"\t " +
- "genstamp=\"" + block.getGenerationStamp() + "\"\t " +
- "id=\"" + block.getBlockId() +"\"";
- }
-
static LogEntry parseEntry(String line) {
LogEntry entry = new LogEntry();