You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sh...@apache.org on 2012/02/07 02:22:44 UTC
svn commit: r1241312 - in /hadoop/common/branches/branch-0.22/hdfs: ./
src/java/org/apache/hadoop/hdfs/server/namenode/
src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/
Author: shv
Date: Tue Feb 7 01:22:43 2012
New Revision: 1241312
URL: http://svn.apache.org/viewvc?rev=1241312&view=rev
Log:
HDFS-2886. CreateEditLogs should generate a realistic edit log. Contributed by Konstantin Shvachko.
Modified:
hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
Modified: hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1241312&r1=1241311&r2=1241312&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Tue Feb 7 01:22:43 2012
@@ -12,6 +12,8 @@ Release 0.22.1 - Unreleased
HDFS-2718. Optimize OP_ADD in edits loading. (shv)
+ HDFS-2886. CreateEditLogs should generate a realistic edit log. (shv)
+
BUG FIXES
HDFS-1910. NameNode should not save fsimage twice. (shv)
Modified: hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java?rev=1241312&r1=1241311&r2=1241312&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java (original)
+++ hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java Tue Feb 7 01:22:43 2012
@@ -303,12 +303,9 @@ class FSDirectory implements Closeable {
*/
void updateFile(INodeFile file,
String path,
- PermissionStatus permissions,
BlockInfo[] blocks,
- short replication,
long mtime,
- long atime,
- long preferredBlockSize) throws IOException {
+ long atime) throws IOException {
// Update the salient file attributes.
file.setAccessTime(atime);
Modified: hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java?rev=1241312&r1=1241311&r2=1241312&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java (original)
+++ hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java Tue Feb 7 01:22:43 2012
@@ -216,9 +216,7 @@ public class FSEditLogLoader {
path, permissions, blocks, replication,
mtime, atime, blockSize, clientName, clientMachine);
} else {
- fsDir.updateFile(oldFile,
- path, permissions, blocks, replication,
- mtime, atime, blockSize);
+ fsDir.updateFile(oldFile, path, blocks, mtime, atime);
if(opcode == Ops.OP_CLOSE) { // OP_CLOSE
assert oldFile.isUnderConstruction() :
"File is not under construction: " + path;
Modified: hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java?rev=1241312&r1=1241311&r2=1241312&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java (original)
+++ hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java Tue Feb 7 01:22:43 2012
@@ -92,7 +92,9 @@ public class CreateEditsLog {
dirInode = new INodeDirectory(p, 0L);
editLog.logMkDir(currentDir, dirInode);
}
- editLog.logOpenFile(filePath, inode);
+ editLog.logOpenFile(filePath,
+ new INodeFileUnderConstruction(
+ p, replication, 0, blockSize, "", "", null));
editLog.logCloseFile(filePath, inode);
if (currentBlockId - bidAtSync >= 2000) { // sync every 2K blocks
Modified: hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java?rev=1241312&r1=1241311&r2=1241312&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java (original)
+++ hadoop/common/branches/branch-0.22/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java Tue Feb 7 01:22:43 2012
@@ -83,8 +83,8 @@ public class TestEditLog extends TestCas
for (int i = 0; i < numTransactions; i++) {
INodeFileUnderConstruction inode = new INodeFileUnderConstruction(
p, replication, blockSize, 0, "", "", null);
- editLog.logOpenFile("/filename" + startIndex + i, inode);
- editLog.logCloseFile("/filename" + startIndex + i, inode);
+ editLog.logOpenFile("/filename" + (startIndex + i), inode);
+ editLog.logCloseFile("/filename" + (startIndex + i), inode);
editLog.logSync();
}
}
@@ -379,5 +379,4 @@ public class TestEditLog extends TestCas
originalImage.close();
fsn.close();
}
-
}