svn merge -c 1402265 from trunk for HDFS-4107. Add utility methods for casting INode to INodeFile and INodeFileUnderConstruction.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402271 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
79a14bb25f
commit
1711ef5bfb
|
@ -76,6 +76,9 @@ Release 2.0.3-alpha - Unreleased
|
||||||
|
|
||||||
HDFS-4099. Clean up replication code and add more javadoc. (szetszwo)
|
HDFS-4099. Clean up replication code and add more javadoc. (szetszwo)
|
||||||
|
|
||||||
|
HDFS-4107. Add utility methods for casting INode to INodeFile and
|
||||||
|
INodeFileUnderConstruction. (szetszwo)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
BUG FIXES
|
BUG FIXES
|
||||||
|
|
|
@ -966,7 +966,7 @@ public class FSDirectory implements Closeable {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
int totalBlocks = 0;
|
int totalBlocks = 0;
|
||||||
for(String src : srcs) {
|
for(String src : srcs) {
|
||||||
INodeFile srcInode = getFileINode(src);
|
INodeFile srcInode = (INodeFile)getINode(src);
|
||||||
allSrcInodes[i++] = srcInode;
|
allSrcInodes[i++] = srcInode;
|
||||||
totalBlocks += srcInode.blocks.length;
|
totalBlocks += srcInode.blocks.length;
|
||||||
}
|
}
|
||||||
|
@ -1230,25 +1230,13 @@ public class FSDirectory implements Closeable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get {@link INode} associated with the file.
|
|
||||||
*/
|
|
||||||
INodeFile getFileINode(String src) throws UnresolvedLinkException {
|
|
||||||
INode inode = getINode(src);
|
|
||||||
if (inode == null || inode.isDirectory())
|
|
||||||
return null;
|
|
||||||
assert !inode.isLink();
|
|
||||||
return (INodeFile) inode;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get {@link INode} associated with the file / directory.
|
* Get {@link INode} associated with the file / directory.
|
||||||
*/
|
*/
|
||||||
INode getINode(String src) throws UnresolvedLinkException {
|
INode getINode(String src) throws UnresolvedLinkException {
|
||||||
readLock();
|
readLock();
|
||||||
try {
|
try {
|
||||||
INode iNode = rootDir.getNode(src, true);
|
return rootDir.getNode(src, true);
|
||||||
return iNode;
|
|
||||||
} finally {
|
} finally {
|
||||||
readUnlock();
|
readUnlock();
|
||||||
}
|
}
|
||||||
|
|
|
@ -479,8 +479,8 @@ public class FSEditLogLoader {
|
||||||
Lease lease = fsNamesys.leaseManager.getLease(
|
Lease lease = fsNamesys.leaseManager.getLease(
|
||||||
reassignLeaseOp.leaseHolder);
|
reassignLeaseOp.leaseHolder);
|
||||||
INodeFileUnderConstruction pendingFile =
|
INodeFileUnderConstruction pendingFile =
|
||||||
(INodeFileUnderConstruction) fsDir.getFileINode(
|
INodeFileUnderConstruction.valueOf(
|
||||||
reassignLeaseOp.path);
|
fsDir.getINode(reassignLeaseOp.path), reassignLeaseOp.path);
|
||||||
fsNamesys.reassignLeaseInternal(lease,
|
fsNamesys.reassignLeaseInternal(lease,
|
||||||
reassignLeaseOp.path, reassignLeaseOp.newHolder, pendingFile);
|
reassignLeaseOp.path, reassignLeaseOp.newHolder, pendingFile);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -365,14 +365,7 @@ class FSImageFormat {
|
||||||
|
|
||||||
// verify that file exists in namespace
|
// verify that file exists in namespace
|
||||||
String path = cons.getLocalName();
|
String path = cons.getLocalName();
|
||||||
INode old = fsDir.getFileINode(path);
|
INodeFile oldnode = INodeFile.valueOf(fsDir.getINode(path), path);
|
||||||
if (old == null) {
|
|
||||||
throw new IOException("Found lease for non-existent file " + path);
|
|
||||||
}
|
|
||||||
if (old.isDirectory()) {
|
|
||||||
throw new IOException("Found lease for directory " + path);
|
|
||||||
}
|
|
||||||
INodeFile oldnode = (INodeFile) old;
|
|
||||||
fsDir.replaceNode(path, oldnode, cons);
|
fsDir.replaceNode(path, oldnode, cons);
|
||||||
namesystem.leaseManager.addLease(cons.getClientName(), path);
|
namesystem.leaseManager.addLease(cons.getClientName(), path);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1251,11 +1251,7 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
}
|
}
|
||||||
|
|
||||||
long now = now();
|
long now = now();
|
||||||
INodeFile inode = dir.getFileINode(src);
|
final INodeFile inode = INodeFile.valueOf(dir.getINode(src), src);
|
||||||
if (inode == null) {
|
|
||||||
throw new FileNotFoundException("File does not exist: " + src);
|
|
||||||
}
|
|
||||||
assert !inode.isLink();
|
|
||||||
if (doAccessTime && isAccessTimeSupported()) {
|
if (doAccessTime && isAccessTimeSupported()) {
|
||||||
if (now <= inode.getAccessTime() + getAccessTimePrecision()) {
|
if (now <= inode.getAccessTime() + getAccessTimePrecision()) {
|
||||||
// if we have to set access time but we only have the readlock, then
|
// if we have to set access time but we only have the readlock, then
|
||||||
|
@ -1371,28 +1367,27 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
|
|
||||||
// we put the following prerequisite for the operation
|
// we put the following prerequisite for the operation
|
||||||
// replication and blocks sizes should be the same for ALL the blocks
|
// replication and blocks sizes should be the same for ALL the blocks
|
||||||
|
|
||||||
// check the target
|
// check the target
|
||||||
INode inode = dir.getFileINode(target);
|
final INodeFile trgInode = INodeFile.valueOf(dir.getINode(target), target);
|
||||||
|
if(trgInode.isUnderConstruction()) {
|
||||||
if(inode == null) {
|
throw new HadoopIllegalArgumentException("concat: target file "
|
||||||
throw new IllegalArgumentException("concat: trg file doesn't exist");
|
+ target + " is under construction");
|
||||||
}
|
}
|
||||||
if(inode.isUnderConstruction()) {
|
// per design target shouldn't be empty and all the blocks same size
|
||||||
throw new IllegalArgumentException("concat: trg file is uner construction");
|
|
||||||
}
|
|
||||||
|
|
||||||
INodeFile trgInode = (INodeFile) inode;
|
|
||||||
|
|
||||||
// per design trg shouldn't be empty and all the blocks same size
|
|
||||||
if(trgInode.blocks.length == 0) {
|
if(trgInode.blocks.length == 0) {
|
||||||
throw new IllegalArgumentException("concat: "+ target + " file is empty");
|
throw new HadoopIllegalArgumentException("concat: target file "
|
||||||
|
+ target + " is empty");
|
||||||
}
|
}
|
||||||
|
|
||||||
long blockSize = trgInode.getPreferredBlockSize();
|
long blockSize = trgInode.getPreferredBlockSize();
|
||||||
|
|
||||||
// check the end block to be full
|
// check the end block to be full
|
||||||
if(blockSize != trgInode.blocks[trgInode.blocks.length-1].getNumBytes()) {
|
if(blockSize != trgInode.blocks[trgInode.blocks.length-1].getNumBytes()) {
|
||||||
throw new IllegalArgumentException(target + " blocks size should be the same");
|
throw new HadoopIllegalArgumentException("The last block in " + target
|
||||||
|
+ " is not full; last block size = "
|
||||||
|
+ trgInode.blocks[trgInode.blocks.length-1].getNumBytes()
|
||||||
|
+ " but file block size = " + blockSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
si.add(trgInode);
|
si.add(trgInode);
|
||||||
|
@ -1405,21 +1400,21 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
if(i==srcs.length-1)
|
if(i==srcs.length-1)
|
||||||
endSrc=true;
|
endSrc=true;
|
||||||
|
|
||||||
INodeFile srcInode = dir.getFileINode(src);
|
final INodeFile srcInode = INodeFile.valueOf(dir.getINode(src), src);
|
||||||
|
|
||||||
if(src.isEmpty()
|
if(src.isEmpty()
|
||||||
|| srcInode == null
|
|
||||||
|| srcInode.isUnderConstruction()
|
|| srcInode.isUnderConstruction()
|
||||||
|| srcInode.blocks.length == 0) {
|
|| srcInode.blocks.length == 0) {
|
||||||
throw new IllegalArgumentException("concat: file " + src +
|
throw new HadoopIllegalArgumentException("concat: source file " + src
|
||||||
" is invalid or empty or underConstruction");
|
+ " is invalid or empty or underConstruction");
|
||||||
}
|
}
|
||||||
|
|
||||||
// check replication and blocks size
|
// check replication and blocks size
|
||||||
if(repl != srcInode.getBlockReplication()) {
|
if(repl != srcInode.getBlockReplication()) {
|
||||||
throw new IllegalArgumentException(src + " and " + target + " " +
|
throw new HadoopIllegalArgumentException("concat: the soruce file "
|
||||||
"should have same replication: "
|
+ src + " and the target file " + target
|
||||||
+ repl + " vs. " + srcInode.getBlockReplication());
|
+ " should have the same replication: source replication is "
|
||||||
|
+ srcInode.getBlockReplication()
|
||||||
|
+ " but target replication is " + repl);
|
||||||
}
|
}
|
||||||
|
|
||||||
//boolean endBlock=false;
|
//boolean endBlock=false;
|
||||||
|
@ -1429,8 +1424,11 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
if(endSrc)
|
if(endSrc)
|
||||||
idx = srcInode.blocks.length-2; // end block of endSrc is OK not to be full
|
idx = srcInode.blocks.length-2; // end block of endSrc is OK not to be full
|
||||||
if(idx >= 0 && srcInode.blocks[idx].getNumBytes() != blockSize) {
|
if(idx >= 0 && srcInode.blocks[idx].getNumBytes() != blockSize) {
|
||||||
throw new IllegalArgumentException("concat: blocks sizes of " +
|
throw new HadoopIllegalArgumentException("concat: the soruce file "
|
||||||
src + " and " + target + " should all be the same");
|
+ src + " and the target file " + target
|
||||||
|
+ " should have the same blocks sizes: target block size is "
|
||||||
|
+ blockSize + " but the size of source block " + idx + " is "
|
||||||
|
+ srcInode.blocks[idx].getNumBytes());
|
||||||
}
|
}
|
||||||
|
|
||||||
si.add(srcInode);
|
si.add(srcInode);
|
||||||
|
@ -1439,7 +1437,8 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
// make sure no two files are the same
|
// make sure no two files are the same
|
||||||
if(si.size() < srcs.length+1) { // trg + srcs
|
if(si.size() < srcs.length+1) { // trg + srcs
|
||||||
// it means at least two files are the same
|
// it means at least two files are the same
|
||||||
throw new IllegalArgumentException("at least two files are the same");
|
throw new HadoopIllegalArgumentException(
|
||||||
|
"concat: at least two of the source files are the same");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(NameNode.stateChangeLog.isDebugEnabled()) {
|
if(NameNode.stateChangeLog.isDebugEnabled()) {
|
||||||
|
@ -1777,14 +1776,10 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
verifyParentDir(src);
|
verifyParentDir(src);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
|
||||||
INodeFile myFile = dir.getFileINode(src);
|
|
||||||
try {
|
try {
|
||||||
blockManager.verifyReplication(src, replication, clientMachine);
|
blockManager.verifyReplication(src, replication, clientMachine);
|
||||||
} catch(IOException e) {
|
|
||||||
throw new IOException("failed to create "+e.getMessage());
|
|
||||||
}
|
|
||||||
boolean create = flag.contains(CreateFlag.CREATE);
|
boolean create = flag.contains(CreateFlag.CREATE);
|
||||||
|
final INode myFile = dir.getINode(src);
|
||||||
if (myFile == null) {
|
if (myFile == null) {
|
||||||
if (!create) {
|
if (!create) {
|
||||||
throw new FileNotFoundException("failed to overwrite or append to non-existent file "
|
throw new FileNotFoundException("failed to overwrite or append to non-existent file "
|
||||||
|
@ -1810,8 +1805,9 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
blockManager.getDatanodeManager().getDatanodeByHost(clientMachine);
|
blockManager.getDatanodeManager().getDatanodeByHost(clientMachine);
|
||||||
|
|
||||||
if (append && myFile != null) {
|
if (append && myFile != null) {
|
||||||
|
final INodeFile f = INodeFile.valueOf(myFile, src);
|
||||||
return prepareFileForWrite(
|
return prepareFileForWrite(
|
||||||
src, myFile, holder, clientMachine, clientNode, true);
|
src, f, holder, clientMachine, clientNode, true);
|
||||||
} else {
|
} else {
|
||||||
// Now we can add the name to the filesystem. This file has no
|
// Now we can add the name to the filesystem. This file has no
|
||||||
// blocks associated with it.
|
// blocks associated with it.
|
||||||
|
@ -1905,11 +1901,7 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
throw new IOException("Invalid file name: " + src);
|
throw new IOException("Invalid file name: " + src);
|
||||||
}
|
}
|
||||||
|
|
||||||
INode inode = dir.getFileINode(src);
|
final INodeFile inode = INodeFile.valueOf(dir.getINode(src), src);
|
||||||
if (inode == null) {
|
|
||||||
throw new FileNotFoundException("File not found " + src);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!inode.isUnderConstruction()) {
|
if (!inode.isUnderConstruction()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -2310,35 +2302,32 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
private INodeFileUnderConstruction checkLease(String src, String holder)
|
private INodeFileUnderConstruction checkLease(String src, String holder)
|
||||||
throws LeaseExpiredException, UnresolvedLinkException {
|
throws LeaseExpiredException, UnresolvedLinkException {
|
||||||
assert hasReadOrWriteLock();
|
assert hasReadOrWriteLock();
|
||||||
INodeFile file = dir.getFileINode(src);
|
return checkLease(src, holder, dir.getINode(src));
|
||||||
checkLease(src, holder, file);
|
|
||||||
return (INodeFileUnderConstruction)file;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkLease(String src, String holder, INode file)
|
private INodeFileUnderConstruction checkLease(String src, String holder,
|
||||||
throws LeaseExpiredException {
|
INode file) throws LeaseExpiredException {
|
||||||
assert hasReadOrWriteLock();
|
assert hasReadOrWriteLock();
|
||||||
if (file == null || file.isDirectory()) {
|
if (file == null || !(file instanceof INodeFile)) {
|
||||||
Lease lease = leaseManager.getLease(holder);
|
Lease lease = leaseManager.getLease(holder);
|
||||||
throw new LeaseExpiredException("No lease on " + src +
|
throw new LeaseExpiredException(
|
||||||
" File does not exist. " +
|
"No lease on " + src + ": File does not exist. "
|
||||||
(lease != null ? lease.toString() :
|
+ (lease != null ? lease.toString()
|
||||||
"Holder " + holder +
|
: "Holder " + holder + " does not have any open files."));
|
||||||
" does not have any open files."));
|
|
||||||
}
|
}
|
||||||
if (!file.isUnderConstruction()) {
|
if (!file.isUnderConstruction()) {
|
||||||
Lease lease = leaseManager.getLease(holder);
|
Lease lease = leaseManager.getLease(holder);
|
||||||
throw new LeaseExpiredException("No lease on " + src +
|
throw new LeaseExpiredException(
|
||||||
" File is not open for writing. " +
|
"No lease on " + src + ": File is not open for writing. "
|
||||||
(lease != null ? lease.toString() :
|
+ (lease != null ? lease.toString()
|
||||||
"Holder " + holder +
|
: "Holder " + holder + " does not have any open files."));
|
||||||
" does not have any open files."));
|
|
||||||
}
|
}
|
||||||
INodeFileUnderConstruction pendingFile = (INodeFileUnderConstruction)file;
|
INodeFileUnderConstruction pendingFile = (INodeFileUnderConstruction)file;
|
||||||
if (holder != null && !pendingFile.getClientName().equals(holder)) {
|
if (holder != null && !pendingFile.getClientName().equals(holder)) {
|
||||||
throw new LeaseExpiredException("Lease mismatch on " + src + " owned by "
|
throw new LeaseExpiredException("Lease mismatch on " + src + " owned by "
|
||||||
+ pendingFile.getClientName() + " but is accessed by " + holder);
|
+ pendingFile.getClientName() + " but is accessed by " + holder);
|
||||||
}
|
}
|
||||||
|
return pendingFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2380,15 +2369,15 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
try {
|
try {
|
||||||
pendingFile = checkLease(src, holder);
|
pendingFile = checkLease(src, holder);
|
||||||
} catch (LeaseExpiredException lee) {
|
} catch (LeaseExpiredException lee) {
|
||||||
INodeFile file = dir.getFileINode(src);
|
final INode inode = dir.getINode(src);
|
||||||
if (file != null && !file.isUnderConstruction()) {
|
if (inode != null && inode instanceof INodeFile && !inode.isUnderConstruction()) {
|
||||||
// This could be a retry RPC - i.e the client tried to close
|
// This could be a retry RPC - i.e the client tried to close
|
||||||
// the file, but missed the RPC response. Thus, it is trying
|
// the file, but missed the RPC response. Thus, it is trying
|
||||||
// again to close the file. If the file still exists and
|
// again to close the file. If the file still exists and
|
||||||
// the client's view of the last block matches the actual
|
// the client's view of the last block matches the actual
|
||||||
// last block, then we'll treat it as a successful close.
|
// last block, then we'll treat it as a successful close.
|
||||||
// See HDFS-3031.
|
// See HDFS-3031.
|
||||||
Block realLastBlock = file.getLastBlock();
|
final Block realLastBlock = ((INodeFile)inode).getLastBlock();
|
||||||
if (Block.matchingIdAndGenStamp(last, realLastBlock)) {
|
if (Block.matchingIdAndGenStamp(last, realLastBlock)) {
|
||||||
NameNode.stateChangeLog.info("DIR* NameSystem.completeFile: " +
|
NameNode.stateChangeLog.info("DIR* NameSystem.completeFile: " +
|
||||||
"received request from " + holder + " to complete file " + src +
|
"received request from " + holder + " to complete file " + src +
|
||||||
|
@ -2974,23 +2963,9 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
LOG.info("Recovering lease=" + lease + ", src=" + src);
|
LOG.info("Recovering lease=" + lease + ", src=" + src);
|
||||||
assert !isInSafeMode();
|
assert !isInSafeMode();
|
||||||
assert hasWriteLock();
|
assert hasWriteLock();
|
||||||
INodeFile iFile = dir.getFileINode(src);
|
|
||||||
if (iFile == null) {
|
|
||||||
final String message = "DIR* NameSystem.internalReleaseLease: "
|
|
||||||
+ "attempt to release a create lock on "
|
|
||||||
+ src + " file does not exist.";
|
|
||||||
NameNode.stateChangeLog.warn(message);
|
|
||||||
throw new IOException(message);
|
|
||||||
}
|
|
||||||
if (!iFile.isUnderConstruction()) {
|
|
||||||
final String message = "DIR* NameSystem.internalReleaseLease: "
|
|
||||||
+ "attempt to release a create lock on "
|
|
||||||
+ src + " but file is already closed.";
|
|
||||||
NameNode.stateChangeLog.warn(message);
|
|
||||||
throw new IOException(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
INodeFileUnderConstruction pendingFile = (INodeFileUnderConstruction) iFile;
|
final INodeFileUnderConstruction pendingFile
|
||||||
|
= INodeFileUnderConstruction.valueOf(dir.getINode(src), src);
|
||||||
int nrBlocks = pendingFile.numBlocks();
|
int nrBlocks = pendingFile.numBlocks();
|
||||||
BlockInfo[] blocks = pendingFile.getBlocks();
|
BlockInfo[] blocks = pendingFile.getBlocks();
|
||||||
|
|
||||||
|
@ -4298,17 +4273,14 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
try {
|
try {
|
||||||
for (Lease lease : leaseManager.getSortedLeases()) {
|
for (Lease lease : leaseManager.getSortedLeases()) {
|
||||||
for (String path : lease.getPaths()) {
|
for (String path : lease.getPaths()) {
|
||||||
INode node;
|
final INodeFileUnderConstruction cons;
|
||||||
try {
|
try {
|
||||||
node = dir.getFileINode(path);
|
cons = INodeFileUnderConstruction.valueOf(dir.getINode(path), path);
|
||||||
} catch (UnresolvedLinkException e) {
|
} catch (UnresolvedLinkException e) {
|
||||||
throw new AssertionError("Lease files should reside on this FS");
|
throw new AssertionError("Lease files should reside on this FS");
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
assert node != null : "Found a lease for nonexisting file.";
|
|
||||||
assert node.isUnderConstruction() :
|
|
||||||
"Found a lease for file " + path + " that is not under construction." +
|
|
||||||
" lease=" + lease;
|
|
||||||
INodeFileUnderConstruction cons = (INodeFileUnderConstruction) node;
|
|
||||||
BlockInfo[] blocks = cons.getBlocks();
|
BlockInfo[] blocks = cons.getBlocks();
|
||||||
if(blocks == null)
|
if(blocks == null)
|
||||||
continue;
|
continue;
|
||||||
|
@ -4891,21 +4863,12 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
||||||
for (Lease lease : leaseManager.getSortedLeases()) {
|
for (Lease lease : leaseManager.getSortedLeases()) {
|
||||||
for(String path : lease.getPaths()) {
|
for(String path : lease.getPaths()) {
|
||||||
// verify that path exists in namespace
|
// verify that path exists in namespace
|
||||||
INode node;
|
final INodeFileUnderConstruction cons;
|
||||||
try {
|
try {
|
||||||
node = dir.getFileINode(path);
|
cons = INodeFileUnderConstruction.valueOf(dir.getINode(path), path);
|
||||||
} catch (UnresolvedLinkException e) {
|
} catch (UnresolvedLinkException e) {
|
||||||
throw new AssertionError("Lease files should reside on this FS");
|
throw new AssertionError("Lease files should reside on this FS");
|
||||||
}
|
}
|
||||||
if (node == null) {
|
|
||||||
throw new IOException("saveLeases found path " + path +
|
|
||||||
" but no matching entry in namespace.");
|
|
||||||
}
|
|
||||||
if (!node.isUnderConstruction()) {
|
|
||||||
throw new IOException("saveLeases found path " + path +
|
|
||||||
" but is not under construction.");
|
|
||||||
}
|
|
||||||
INodeFileUnderConstruction cons = (INodeFileUnderConstruction) node;
|
|
||||||
FSImageSerialization.writeINodeUnderConstruction(out, cons, path);
|
FSImageSerialization.writeINodeUnderConstruction(out, cons, path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.hadoop.hdfs.server.namenode;
|
package org.apache.hadoop.hdfs.server.namenode;
|
||||||
|
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -32,6 +33,17 @@ import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoUnderConstruction;
|
||||||
/** I-node for closed file. */
|
/** I-node for closed file. */
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
class INodeFile extends INode implements BlockCollection {
|
class INodeFile extends INode implements BlockCollection {
|
||||||
|
/** Cast INode to INodeFile. */
|
||||||
|
public static INodeFile valueOf(INode inode, String path) throws IOException {
|
||||||
|
if (inode == null) {
|
||||||
|
throw new FileNotFoundException("File does not exist: " + path);
|
||||||
|
}
|
||||||
|
if (!(inode instanceof INodeFile)) {
|
||||||
|
throw new FileNotFoundException("Path is not a file: " + path);
|
||||||
|
}
|
||||||
|
return (INodeFile)inode;
|
||||||
|
}
|
||||||
|
|
||||||
static final FsPermission UMASK = FsPermission.createImmutable((short)0111);
|
static final FsPermission UMASK = FsPermission.createImmutable((short)0111);
|
||||||
|
|
||||||
//Number of bits for Block size
|
//Number of bits for Block size
|
||||||
|
|
|
@ -25,8 +25,8 @@ import org.apache.hadoop.hdfs.protocol.Block;
|
||||||
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
|
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
|
||||||
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoUnderConstruction;
|
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoUnderConstruction;
|
||||||
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
|
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
|
||||||
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.BlockUCState;
|
|
||||||
import org.apache.hadoop.hdfs.server.blockmanagement.MutableBlockCollection;
|
import org.apache.hadoop.hdfs.server.blockmanagement.MutableBlockCollection;
|
||||||
|
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.BlockUCState;
|
||||||
|
|
||||||
import com.google.common.base.Joiner;
|
import com.google.common.base.Joiner;
|
||||||
|
|
||||||
|
@ -35,6 +35,16 @@ import com.google.common.base.Joiner;
|
||||||
*/
|
*/
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
class INodeFileUnderConstruction extends INodeFile implements MutableBlockCollection {
|
class INodeFileUnderConstruction extends INodeFile implements MutableBlockCollection {
|
||||||
|
/** Cast INode to INodeFileUnderConstruction. */
|
||||||
|
public static INodeFileUnderConstruction valueOf(INode inode, String path
|
||||||
|
) throws IOException {
|
||||||
|
final INodeFile file = INodeFile.valueOf(inode, path);
|
||||||
|
if (!file.isUnderConstruction()) {
|
||||||
|
throw new IOException("File is not under construction: " + path);
|
||||||
|
}
|
||||||
|
return (INodeFileUnderConstruction)file;
|
||||||
|
}
|
||||||
|
|
||||||
private String clientName; // lease holder
|
private String clientName; // lease holder
|
||||||
private final String clientMachine;
|
private final String clientMachine;
|
||||||
private final DatanodeDescriptor clientNode; // if client is a cluster node too.
|
private final DatanodeDescriptor clientNode; // if client is a cluster node too.
|
||||||
|
|
|
@ -253,7 +253,7 @@ public class LeaseManager {
|
||||||
private String findPath(INodeFileUnderConstruction pendingFile) {
|
private String findPath(INodeFileUnderConstruction pendingFile) {
|
||||||
try {
|
try {
|
||||||
for (String src : paths) {
|
for (String src : paths) {
|
||||||
if (fsnamesystem.dir.getFileINode(src) == pendingFile) {
|
if (fsnamesystem.dir.getINode(src) == pendingFile) {
|
||||||
return src;
|
return src;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,8 +116,6 @@ public class TestDistributedFileSystem {
|
||||||
DFSTestUtil.createFile(fileSys, p, 1L, (short)1, 0L);
|
DFSTestUtil.createFile(fileSys, p, 1L, (short)1, 0L);
|
||||||
DFSTestUtil.readFile(fileSys, p);
|
DFSTestUtil.readFile(fileSys, p);
|
||||||
|
|
||||||
DFSClient client = ((DistributedFileSystem)fileSys).dfs;
|
|
||||||
|
|
||||||
fileSys.close();
|
fileSys.close();
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -449,7 +447,7 @@ public class TestDistributedFileSystem {
|
||||||
fail("Expecting FileNotFoundException");
|
fail("Expecting FileNotFoundException");
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
assertTrue("Not throwing the intended exception message", e.getMessage()
|
assertTrue("Not throwing the intended exception message", e.getMessage()
|
||||||
.contains("File does not exist: /test/TestExistingDir"));
|
.contains("Path is not a file: /test/TestExistingDir"));
|
||||||
}
|
}
|
||||||
|
|
||||||
//hftp
|
//hftp
|
||||||
|
@ -685,7 +683,6 @@ public class TestDistributedFileSystem {
|
||||||
@Test
|
@Test
|
||||||
public void testCreateWithCustomChecksum() throws Exception {
|
public void testCreateWithCustomChecksum() throws Exception {
|
||||||
Configuration conf = getTestConfiguration();
|
Configuration conf = getTestConfiguration();
|
||||||
final long grace = 1000L;
|
|
||||||
MiniDFSCluster cluster = null;
|
MiniDFSCluster cluster = null;
|
||||||
Path testBasePath = new Path("/test/csum");
|
Path testBasePath = new Path("/test/csum");
|
||||||
// create args
|
// create args
|
||||||
|
|
|
@ -83,8 +83,7 @@ public class TestBlockUnderConstruction {
|
||||||
private void verifyFileBlocks(String file,
|
private void verifyFileBlocks(String file,
|
||||||
boolean isFileOpen) throws IOException {
|
boolean isFileOpen) throws IOException {
|
||||||
FSNamesystem ns = cluster.getNamesystem();
|
FSNamesystem ns = cluster.getNamesystem();
|
||||||
INodeFile inode = ns.dir.getFileINode(file);
|
final INodeFile inode = INodeFile.valueOf(ns.dir.getINode(file), file);
|
||||||
assertTrue("File does not exist: " + inode.toString(), inode != null);
|
|
||||||
assertTrue("File " + inode.toString() +
|
assertTrue("File " + inode.toString() +
|
||||||
" isUnderConstruction = " + inode.isUnderConstruction() +
|
" isUnderConstruction = " + inode.isUnderConstruction() +
|
||||||
" expected to be " + isFileOpen,
|
" expected to be " + isFileOpen,
|
||||||
|
|
|
@ -18,13 +18,17 @@
|
||||||
|
|
||||||
package org.apache.hadoop.hdfs.server.namenode;
|
package org.apache.hadoop.hdfs.server.namenode;
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.junit.Assert.fail;
|
||||||
|
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.apache.hadoop.fs.Path;
|
import org.apache.hadoop.fs.Path;
|
||||||
import org.apache.hadoop.fs.permission.FsPermission;
|
import org.apache.hadoop.fs.permission.FsPermission;
|
||||||
import org.apache.hadoop.fs.permission.PermissionStatus;
|
import org.apache.hadoop.fs.permission.PermissionStatus;
|
||||||
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
|
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class TestINodeFile {
|
public class TestINodeFile {
|
||||||
|
@ -199,4 +203,88 @@ public class TestINodeFile {
|
||||||
|
|
||||||
return iNodes;
|
return iNodes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test for the static {@link INodeFile#valueOf(INode, String)}
|
||||||
|
* and {@link INodeFileUnderConstruction#valueOf(INode, String)} methods.
|
||||||
|
* @throws IOException
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testValueOf () throws IOException {
|
||||||
|
final String path = "/testValueOf";
|
||||||
|
final PermissionStatus perm = new PermissionStatus(
|
||||||
|
userName, null, FsPermission.getDefault());
|
||||||
|
final short replication = 3;
|
||||||
|
|
||||||
|
{//cast from null
|
||||||
|
final INode from = null;
|
||||||
|
|
||||||
|
//cast to INodeFile, should fail
|
||||||
|
try {
|
||||||
|
INodeFile.valueOf(from, path);
|
||||||
|
fail();
|
||||||
|
} catch(FileNotFoundException fnfe) {
|
||||||
|
assertTrue(fnfe.getMessage().contains("File does not exist"));
|
||||||
|
}
|
||||||
|
|
||||||
|
//cast to INodeFileUnderConstruction, should fail
|
||||||
|
try {
|
||||||
|
INodeFileUnderConstruction.valueOf(from, path);
|
||||||
|
fail();
|
||||||
|
} catch(FileNotFoundException fnfe) {
|
||||||
|
assertTrue(fnfe.getMessage().contains("File does not exist"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{//cast from INodeFile
|
||||||
|
final INode from = new INodeFile(
|
||||||
|
perm, null, replication, 0L, 0L, preferredBlockSize);
|
||||||
|
|
||||||
|
//cast to INodeFile, should success
|
||||||
|
final INodeFile f = INodeFile.valueOf(from, path);
|
||||||
|
assertTrue(f == from);
|
||||||
|
|
||||||
|
//cast to INodeFileUnderConstruction, should fail
|
||||||
|
try {
|
||||||
|
INodeFileUnderConstruction.valueOf(from, path);
|
||||||
|
fail();
|
||||||
|
} catch(IOException ioe) {
|
||||||
|
assertTrue(ioe.getMessage().contains("File is not under construction"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{//cast from INodeFileUnderConstruction
|
||||||
|
final INode from = new INodeFileUnderConstruction(
|
||||||
|
perm, replication, 0L, 0L, "client", "machine", null);
|
||||||
|
|
||||||
|
//cast to INodeFile, should success
|
||||||
|
final INodeFile f = INodeFile.valueOf(from, path);
|
||||||
|
assertTrue(f == from);
|
||||||
|
|
||||||
|
//cast to INodeFileUnderConstruction, should success
|
||||||
|
final INodeFileUnderConstruction u = INodeFileUnderConstruction.valueOf(
|
||||||
|
from, path);
|
||||||
|
assertTrue(u == from);
|
||||||
|
}
|
||||||
|
|
||||||
|
{//cast from INodeDirectory
|
||||||
|
final INode from = new INodeDirectory(perm, 0L);
|
||||||
|
|
||||||
|
//cast to INodeFile, should fail
|
||||||
|
try {
|
||||||
|
INodeFile.valueOf(from, path);
|
||||||
|
fail();
|
||||||
|
} catch(FileNotFoundException fnfe) {
|
||||||
|
assertTrue(fnfe.getMessage().contains("Path is not a file"));
|
||||||
|
}
|
||||||
|
|
||||||
|
//cast to INodeFileUnderConstruction, should fail
|
||||||
|
try {
|
||||||
|
INodeFileUnderConstruction.valueOf(from, path);
|
||||||
|
fail();
|
||||||
|
} catch(FileNotFoundException fnfe) {
|
||||||
|
assertTrue(fnfe.getMessage().contains("Path is not a file"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue