hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r757608 - 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
Date Tue, 24 Mar 2009 00:07:15 GMT
Author: szetszwo
Date: Tue Mar 24 00:07:14 2009
New Revision: 757608

URL: http://svn.apache.org/viewvc?rev=757608&view=rev
Log:
Revert HADOOP-5554 (the patch for trunk).  Need a 0.19 patch.

Added:
    hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
      - copied unchanged from r757603, 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/server/namenode/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=757608&r1=757607&r2=757608&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Mar 24 00:07:14 2009
@@ -83,9 +83,6 @@
     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=757608&r1=757607&r2=757608&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
Tue Mar 24 00:07:14 2009
@@ -28,7 +28,6 @@
 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;
 
 
@@ -196,7 +195,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,
-                CreateEditsLog.BLOCK_GENERATION_STAMP);
+                Block.GRANDFATHER_GENERATION_STAMP);
           }
           for (int i = 1; i <= replication; ++i) { 
             // inject blocks for dn_i into dn_i and replica in dn_i's neighbors 



Mime
View raw message