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/03/24 00:47:44 UTC
svn commit: r757604 - in /hadoop/core/branches/branch-0.19: CHANGES.txt
src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
src/test/org/apache/hadoop/hdfs/DataNodeCluster.java
src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
Author: szetszwo
Date: Mon Mar 23 23:47:44 2009
New Revision: 757604
URL: http://svn.apache.org/viewvc?rev=757604&view=rev
Log:
HADOOP-5554. DataNodeCluster and CreateEditsLog should create blocks with the same generation stamp value. (hairong via szetszwo)
Added:
hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
- copied, changed from r757599, hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
Removed:
hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
Modified:
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/DataNodeCluster.java
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=757604&r1=757603&r2=757604&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Mon Mar 23 23:47:44 2009
@@ -83,6 +83,9 @@
HADOOP-5549. ReplicationMonitor should schedule both replication and
deletion work in one iteration. (hairong)
+ HADOOP-5554. DataNodeCluster and CreateEditsLog should create blocks with
+ the same generation stamp value. (hairong via szetszwo)
+
Release 0.19.1 - 2009-02-23
HADOOP-5225. Workaround for tmp file handling in HDFS. sync() is
Modified: hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/DataNodeCluster.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/DataNodeCluster.java?rev=757604&r1=757603&r2=757604&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/DataNodeCluster.java (original)
+++ hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/DataNodeCluster.java Mon Mar 23 23:47:44 2009
@@ -28,6 +28,7 @@
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
+import org.apache.hadoop.hdfs.server.namenode.CreateEditsLog;
import org.apache.hadoop.net.DNS;
@@ -195,7 +196,7 @@
for (int i_dn = 0; i_dn < numDataNodes; ++i_dn) {
for (int i = 0; i < blocks.length; ++i) {
blocks[i] = new Block(blkid++, blockSize,
- Block.GRANDFATHER_GENERATION_STAMP);
+ CreateEditsLog.BLOCK_GENERATION_STAMP);
}
for (int i = 1; i <= replication; ++i) {
// inject blocks for dn_i into dn_i and replica in dn_i's neighbors
Copied: hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java (from r757599, hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java)
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java?p2=hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java&p1=hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java&r1=757599&r2=757604&rev=757604&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java (original)
+++ hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java Mon Mar 23 23:47:44 2009
@@ -58,6 +58,8 @@
static final String BASE_PATH = "/createdViaInjectingInEditsLog";
static final String EDITS_DIR = "/tmp/EditsLogOut";
static String edits_dir = EDITS_DIR;
+ static final public long BLOCK_GENERATION_STAMP =
+ GenerationStamp.FIRST_VALID_STAMP;
static void addFiles(FSEditLog editLog, int numFiles, short replication,
int blocksPerFile, long startingBlockId,
@@ -71,7 +73,7 @@
BlockInfo[] blocks = new BlockInfo[blocksPerFile];
for (int iB = 0; iB < blocksPerFile; ++iB) {
blocks[iB] =
- new BlockInfo(new Block(0, blockSize, GenerationStamp.FIRST_VALID_STAMP),
+ new BlockInfo(new Block(0, blockSize, BLOCK_GENERATION_STAMP),
replication);
}