Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467534 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Shvachko 2013-04-13 01:35:58 +00:00
parent 5e94420456
commit 242028a3fb
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -503,6 +503,9 @@ Release 2.0.5-beta - UNRELEASED
HDFS-4643. Fix flakiness in TestQuorumJournalManager. (todd) HDFS-4643. Fix flakiness in TestQuorumJournalManager. (todd)
HDFS-4639. startFileInternal() should not increment generation stamp.
(Plamen Jeliazkov via shv)
Release 2.0.4-alpha - UNRELEASED Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
View File

@ -235,8 +235,7 @@ public class FSDirectory implements Closeable {
long preferredBlockSize, long preferredBlockSize,
String clientName, String clientName,
String clientMachine, String clientMachine,
DatanodeDescriptor clientNode, DatanodeDescriptor clientNode)
long generationStamp)
throws FileAlreadyExistsException, QuotaExceededException, throws FileAlreadyExistsException, QuotaExceededException,
UnresolvedLinkException { UnresolvedLinkException {
waitForReady(); waitForReady();

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -1907,9 +1907,8 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
checkFsObjectLimit(); checkFsObjectLimit();
// increment global generation stamp // increment global generation stamp
long genstamp = nextGenerationStamp();
INodeFileUnderConstruction newNode = dir.addFile(src, permissions, INodeFileUnderConstruction newNode = dir.addFile(src, permissions,
replication, blockSize, holder, clientMachine, clientNode, genstamp); replication, blockSize, holder, clientMachine, clientNode);
if (newNode == null) { if (newNode == null) {
throw new IOException("DIR* NameSystem.startFile: " + throw new IOException("DIR* NameSystem.startFile: " +
"Unable to add file to namespace."); "Unable to add file to namespace.");

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUpgrade.java
View File

@ -53,7 +53,7 @@ import com.google.common.base.Joiner;
*/ */
public class TestDFSUpgrade { public class TestDFSUpgrade {
private static final int EXPECTED_TXID = 49; private static final int EXPECTED_TXID = 45;
private static final Log LOG = LogFactory.getLog(TestDFSUpgrade.class.getName()); private static final Log LOG = LogFactory.getLog(TestDFSUpgrade.class.getName());
private Configuration conf; private Configuration conf;
private int testCounter = 0; private int testCounter = 0;

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
View File

@ -1129,7 +1129,7 @@ public class TestCheckpoint {
throw new IOException(e); throw new IOException(e);
} }
final int EXPECTED_TXNS_FIRST_SEG = 12; final int EXPECTED_TXNS_FIRST_SEG = 11;
// the following steps should have happened: // the following steps should have happened:
// edits_inprogress_1 -> edits_1-12 (finalized) // edits_inprogress_1 -> edits_1-12 (finalized)