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 su...@apache.org on 2011/09/03 02:35:32 UTC
svn commit: r1164772 - in /hadoop/common/branches/branch-0.20-security: ./
src/hdfs/org/apache/hadoop/hdfs/server/datanode/
src/hdfs/org/apache/hadoop/hdfs/server/namenode/
src/hdfs/org/apache/hadoop/hdfs/server/protocol/
Author: suresh
Date: Sat Sep 3 00:35:31 2011
New Revision: 1164772
URL: http://svn.apache.org/viewvc?rev=1164772&view=rev
Log:
Porting from 0.20-append - HDFS-1555. Disallow pipelien recovery if a file is already being
lease recovered. Contributed by Hairong Kuang.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1164772&r1=1164771&r2=1164772&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Sat Sep 3 00:35:31 2011
@@ -89,6 +89,9 @@ Release 0.20.205.0 - unreleased
HDFS-724. Use a bidirectional heartbeat to detect stuck
pipeline. (hairong)
+ HDFS-1555. Disallow pipelien recovery if a file is already being
+ lease recovered. (hairong)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1164772&r1=1164771&r2=1164772&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java Sat Sep 3 00:35:31 2011
@@ -1774,7 +1774,7 @@ public class DataNode extends Configured
List<DatanodeID> successList = new ArrayList<DatanodeID>();
- long generationstamp = namenode.nextGenerationStamp(block);
+ long generationstamp = namenode.nextGenerationStamp(block, closeFile);
Block newblock = new Block(block.getBlockId(), block.getNumBytes(), generationstamp);
for(BlockRecord r : syncList) {
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1164772&r1=1164771&r2=1164772&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Sat Sep 3 00:35:31 2011
@@ -5194,8 +5194,12 @@ public class FSNamesystem implements FSC
/**
* Verifies that the block is associated with a file that has a lease.
* Increments, logs and then returns the stamp
- */
- synchronized long nextGenerationStampForBlock(Block block) throws IOException {
+ *
+ * @param block block
+ * @param fromNN if it is for lease recovery initiated by NameNode
+ * @return a new generation stamp
+ */
+ synchronized long nextGenerationStampForBlock(Block block, boolean fromNN) throws IOException {
if (isInSafeMode()) {
throw new SafeModeException("Cannot get nextGenStamp for " + block, safeMode);
}
@@ -5211,6 +5215,15 @@ public class FSNamesystem implements FSC
LOG.info(msg);
throw new IOException(msg);
}
+ // Disallow client-initiated recovery once
+ // NameNode initiated lease recovery starts
+ if (!fromNN && HdfsConstants.NN_RECOVERY_LEASEHOLDER.equals(
+ leaseManager.getLeaseByPath(FSDirectory.getFullPathName(fileINode)).getHolder())) {
+ String msg = block +
+ "is being recovered by NameNode, ignoring the request from a client";
+ LOG.info(msg);
+ throw new IOException(msg);
+ }
if (!((INodeFileUnderConstruction)fileINode).setLastRecoveryTime(now())) {
String msg = block + " is already being recovered, ignoring this request.";
LOG.info(msg);
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java?rev=1164772&r1=1164771&r2=1164772&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java Sat Sep 3 00:35:31 2011
@@ -201,6 +201,12 @@ public class LeaseManager {
this.holder = holder;
renew();
}
+
+ /** Get the holder of the lease */
+ public String getHolder() {
+ return holder;
+ }
+
/** Only LeaseManager object can renew a lease */
private void renew() {
this.lastUpdate = FSNamesystem.now();
@@ -278,10 +284,6 @@ public class LeaseManager {
return paths;
}
- String getHolder() {
- return holder;
- }
-
void replacePath(String oldpath, String newpath) {
paths.remove(oldpath);
paths.add(newpath);
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1164772&r1=1164771&r2=1164772&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java Sat Sep 3 00:35:31 2011
@@ -673,8 +673,8 @@ public class NameNode implements ClientP
}
/** {@inheritDoc} */
- public long nextGenerationStamp(Block block) throws IOException{
- return namesystem.nextGenerationStampForBlock(block);
+ public long nextGenerationStamp(Block block, boolean fromNN) throws IOException{
+ return namesystem.nextGenerationStampForBlock(block, fromNN);
}
/** {@inheritDoc} */
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java?rev=1164772&r1=1164771&r2=1164772&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java Sat Sep 3 00:35:31 2011
@@ -41,13 +41,11 @@ import org.apache.hadoop.security.Kerber
clientPrincipal = DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY)
public interface DatanodeProtocol extends VersionedProtocol {
/**
- * 25: Serialized format of BlockTokenIdentifier changed to contain
- * multiple blocks within a single BlockTokenIdentifier
- *
- * (bumped to 25 to bring in line with trunk)
+ * 26: nextGenerationStamp has a new parameter indicating if it is for
+ * NameNode initiated lease recovery or not
*/
- public static final long versionID = 25L;
-
+ public static final long versionID = 26L;
+
// error code
final static int NOTIFY = 0;
final static int DISK_ERROR = 1; // there are still valid volumes on DN
@@ -152,10 +150,14 @@ public interface DatanodeProtocol extend
public void reportBadBlocks(LocatedBlock[] blocks) throws IOException;
/**
- * @return the next GenerationStamp to be associated with the specified
- * block.
+ * Get the next GenerationStamp to be associated with the specified
+ * block.
+ *
+ * @param block block
+ * @param fromNN if it is for lease recovery initiated by NameNode
+ * @return a new generation stamp
*/
- public long nextGenerationStamp(Block block) throws IOException;
+ public long nextGenerationStamp(Block block, boolean fromNN) throws IOException;
/**
* Commit block synchronization in lease recovery