diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockStoragePolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockStoragePolicy.java index 6e90cf19d0..b119359089 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockStoragePolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockStoragePolicy.java @@ -278,7 +278,7 @@ private static StorageType getFallback(EnumSet unavailables, } private static byte parseID(String idString, String element, Configuration conf) { - Byte id = null; + byte id = 0; try { id = Byte.parseByte(idString); } catch(NumberFormatException nfe) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java index 136ebc83ce..4a882cd17f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java @@ -173,6 +173,7 @@ import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.NamenodeRole; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.NodeType; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.ReplicaState; +import org.apache.hadoop.hdfs.server.common.Storage; import org.apache.hadoop.hdfs.server.common.StorageInfo; import org.apache.hadoop.hdfs.server.namenode.CheckpointSignature; import org.apache.hadoop.hdfs.server.namenode.INodeId; @@ -890,9 +891,25 @@ public static BlockCommandProto convert(BlockCommand cmd) { } builder.addAllTargets(convert(cmd.getTargets())) .addAllTargetStorageUuids(convert(cmd.getTargetStorageIDs())); + StorageType[][] types = cmd.getTargetStorageTypes(); + if (types != null) { + builder.addAllTargetStorageTypes(convert(types)); + } return builder.build(); } - + + private static List convert(StorageType[][] types) { + List list = Lists.newArrayList(); + if (types != null) { + for (StorageType[] ts : types) { + StorageTypesProto.Builder builder = StorageTypesProto.newBuilder(); + builder.addAllStorageTypes(convertStorageTypes(ts)); + list.add(builder.build()); + } + } + return list; + } + public static BlockIdCommandProto convert(BlockIdCommand cmd) { BlockIdCommandProto.Builder builder = BlockIdCommandProto.newBuilder() .setBlockPoolId(cmd.getBlockPoolId()); @@ -1021,7 +1038,7 @@ public static BlockCommand convert(BlockCommandProto blkCmd) { } else { for(int i = 0; i < targetStorageTypes.length; i++) { List p = targetStorageTypesList.get(i).getStorageTypesList(); - targetStorageTypes[i] = p.toArray(new StorageType[p.size()]); + targetStorageTypes[i] = convertStorageTypes(p, targets[i].length); } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java index 4d0bb862cb..c7e46586b5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java @@ -1343,6 +1343,11 @@ private static void checkSnapshot(INode target, } } + private byte getStoragePolicyID(byte inodePolicy, byte parentPolicy) { + return inodePolicy != BlockStoragePolicy.ID_UNSPECIFIED ? inodePolicy : + parentPolicy; + } + /** * Get a partial listing of the indicated directory * @@ -1367,14 +1372,13 @@ DirectoryListing getListing(String src, byte[] startAfter, if (srcs.endsWith(HdfsConstants.SEPARATOR_DOT_SNAPSHOT_DIR)) { return getSnapshotsListing(srcs, startAfter); } - final INodesInPath inodesInPath = getINodesInPath(srcs, true); + final INodesInPath inodesInPath = getLastINodeInPath(srcs); final int snapshot = inodesInPath.getPathSnapshotId(); - final INode[] inodes = inodesInPath.getINodes(); - final INode targetNode = inodes[inodes.length - 1]; - byte parentStoragePolicy = isSuperUser ? getStoragePolicy(inodes, - snapshot) : BlockStoragePolicy.ID_UNSPECIFIED; + final INode targetNode = inodesInPath.getLastINode(); if (targetNode == null) return null; + byte parentStoragePolicy = isSuperUser ? + targetNode.getStoragePolicyID() : BlockStoragePolicy.ID_UNSPECIFIED; if (!targetNode.isDirectory()) { return new DirectoryListing( @@ -1393,11 +1397,11 @@ DirectoryListing getListing(String src, byte[] startAfter, HdfsFileStatus listing[] = new HdfsFileStatus[numOfListing]; for (int i=0; i0; i++) { INode cur = contents.get(startChild+i); - byte curPolicy = cur.getStoragePolicyID(snapshot); + byte curPolicy = isSuperUser ? cur.getLocalStoragePolicyID() : + BlockStoragePolicy.ID_UNSPECIFIED; listing[i] = createFileStatus(cur.getLocalNameBytes(), cur, needLocation, - curPolicy != BlockStoragePolicy.ID_UNSPECIFIED ? - curPolicy : parentStoragePolicy, - snapshot, isRawPath); + getStoragePolicyID(curPolicy, parentStoragePolicy), snapshot, + isRawPath); listingCnt++; if (needLocation) { // Once we hit lsLimit locations, stop. @@ -2364,16 +2368,6 @@ HdfsFileStatus createFileStatus(byte[] path, INode node, byte storagePolicy, storagePolicy); } - private byte getStoragePolicy(INode[] inodes, int snapshotId) { - for (int i = inodes.length - 1; i >= 0; i--) { - byte policy = inodes[i].getStoragePolicyID(snapshotId); - if (policy != BlockStoragePolicy.ID_UNSPECIFIED) { - return policy; - } - } - return BlockStoragePolicy.ID_UNSPECIFIED; - } - /** * Create FileStatus with location info by file INode */ diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java index e13a3674cf..1ddcf39299 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java @@ -393,7 +393,7 @@ public static INodeSection.INodeFile.Builder buildINodeFile( .setPermission(buildPermissionStatus(file, state.getStringMap())) .setPreferredBlockSize(file.getPreferredBlockSize()) .setReplication(file.getFileReplication()) - .setStoragePolicyID(file.getStoragePolicyID()); + .setStoragePolicyID(file.getLocalStoragePolicyID()); AclFeature f = file.getAclFeature(); if (f != null) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 4e1bbe18b5..b47350d922 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -106,7 +106,6 @@ import java.net.InetAddress; import java.net.URI; import java.security.GeneralSecurityException; -import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -120,7 +119,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; @@ -182,7 +180,6 @@ import org.apache.hadoop.hdfs.protocol.DatanodeID; import org.apache.hadoop.hdfs.protocol.DatanodeInfo; import org.apache.hadoop.hdfs.protocol.DirectoryListing; -import org.apache.hadoop.hdfs.protocol.EncryptionZone; import org.apache.hadoop.hdfs.protocol.EncryptionZoneWithId; import org.apache.hadoop.hdfs.protocol.ExtendedBlock; import org.apache.hadoop.hdfs.protocol.HdfsConstants; @@ -4207,7 +4204,7 @@ private boolean mkdirsRecursively(String src, PermissionStatus permissions, /** * Get the content summary for a specific file/dir. * - * @param src The string representation of the path to the file + * @param srcArg The string representation of the path to the file * * @throws AccessControlException if access is denied * @throws UnresolvedLinkException if a symlink is encountered. @@ -4944,12 +4941,6 @@ private void closeFile(String path, INodeFile file) { /** * Add the given symbolic link to the fs. Record it in the edits log. - * @param path - * @param target - * @param dirPerms - * @param createParent - * @param logRetryCache - * @param dir */ private INodeSymlink addSymlink(String path, String target, PermissionStatus dirPerms, diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java index 5fe6cfe7f8..307f507d50 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java @@ -29,6 +29,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.permission.PermissionStatus; +import org.apache.hadoop.hdfs.BlockStoragePolicy; import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.QuotaExceededException; @@ -685,13 +686,19 @@ public final INode setAccessTime(long accessTime, int latestSnapshotId) } /** - * @return the storage policy id of the inode + * @return the latest block storage policy id of the INode. Specifically, + * if a storage policy is directly specified on the INode then return the ID + * of that policy. Otherwise follow the latest parental path and return the + * ID of the first specified storage policy. */ - public abstract byte getStoragePolicyID(int snapshotId); + public abstract byte getStoragePolicyID(); - public byte getStoragePolicyID() { - return getStoragePolicyID(Snapshot.CURRENT_STATE_ID); - } + /** + * @return the storage policy directly specified on the INode. Return + * {@link BlockStoragePolicy#ID_UNSPECIFIED} if no policy has + * been specified. + */ + public abstract byte getLocalStoragePolicyID(); /** * Breaks {@code path} into components. diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeAttributes.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeAttributes.java index 7ae334aff6..8b0a5f018b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeAttributes.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeAttributes.java @@ -61,9 +61,6 @@ public interface INodeAttributes { /** @return the access time. */ public long getAccessTime(); - /** @return the storage policy ID */ - public byte getStoragePolicyID(); - /** A read-only copy of the inode attributes. */ public static abstract class SnapshotCopy implements INodeAttributes { private final byte[] name; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java index 784abc8069..f5579ee890 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java @@ -107,10 +107,7 @@ public final INodeDirectory asDirectory() { } @Override - public byte getStoragePolicyID(int snapshotId) { - if (snapshotId != Snapshot.CURRENT_STATE_ID) { - return getSnapshotINode(snapshotId).getStoragePolicyID(); - } + public byte getLocalStoragePolicyID() { XAttrFeature f = getXAttrFeature(); ImmutableList xattrs = f == null ? ImmutableList. of() : f .getXAttrs(); @@ -122,6 +119,17 @@ public byte getStoragePolicyID(int snapshotId) { return BlockStoragePolicy.ID_UNSPECIFIED; } + @Override + public byte getStoragePolicyID() { + byte id = getLocalStoragePolicyID(); + if (id != BlockStoragePolicy.ID_UNSPECIFIED) { + return id; + } + // if it is unspecified, check its parent + return getParent() != null ? getParent().getStoragePolicyID() : + BlockStoragePolicy.ID_UNSPECIFIED; + } + void setQuota(long nsQuota, long dsQuota) { DirectoryWithQuotaFeature quota = getDirectoryWithQuotaFeature(); if (quota != null) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryAttributes.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryAttributes.java index 30cf55a55f..f0f58a9266 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryAttributes.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryAttributes.java @@ -60,19 +60,6 @@ && getPermissionLong() == other.getPermissionLong() && getAclFeature() == other.getAclFeature() && getXAttrFeature() == other.getXAttrFeature(); } - - @Override - public byte getStoragePolicyID() { - XAttrFeature f = getXAttrFeature(); - ImmutableList xattrs = f == null ? ImmutableList. of() : f - .getXAttrs(); - for (XAttr xattr : xattrs) { - if (BlockStoragePolicy.isStoragePolicyXAttr(xattr)) { - return (xattr.getValue())[0]; - } - } - return BlockStoragePolicy.ID_UNSPECIFIED; - } } public static class CopyWithQuota extends INodeDirectoryAttributes.SnapshotCopy { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java index b0238f9c55..7af2b713ea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java @@ -172,7 +172,6 @@ public boolean isUnderConstruction() { return getFileUnderConstructionFeature() != null; } - /** Convert this file to an {@link INodeFileUnderConstruction}. */ INodeFile toUnderConstruction(String clientName, String clientMachine) { Preconditions.checkState(!isUnderConstruction(), "file is already under construction"); @@ -368,16 +367,18 @@ public long getPreferredBlockSize() { } @Override - public byte getStoragePolicyID(int snapshotId) { - if (snapshotId != Snapshot.CURRENT_STATE_ID) { - return getSnapshotINode(snapshotId).getStoragePolicyID(); - } - return getStoragePolicyID(); + public byte getLocalStoragePolicyID() { + return HeaderFormat.getStoragePolicyID(header); } @Override public byte getStoragePolicyID() { - return HeaderFormat.getStoragePolicyID(header); + byte id = getLocalStoragePolicyID(); + if (id == BlockStoragePolicy.ID_UNSPECIFIED) { + return this.getParent() != null ? + this.getParent().getStoragePolicyID() : id; + } + return id; } private void setStoragePolicyID(byte storagePolicyId) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java index 7d533a21bc..f9d2700e63 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java @@ -38,6 +38,8 @@ public interface INodeFileAttributes extends INodeAttributes { public boolean metadataEquals(INodeFileAttributes other); + public byte getLocalStoragePolicyID(); + /** A copy of the inode file attributes */ public static class SnapshotCopy extends INodeAttributes.SnapshotCopy implements INodeFileAttributes { @@ -68,7 +70,7 @@ public long getPreferredBlockSize() { } @Override - public byte getStoragePolicyID() { + public byte getLocalStoragePolicyID() { return HeaderFormat.getStoragePolicyID(header); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java index 85b080d937..87e47151fd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java @@ -124,7 +124,12 @@ public Counts cleanSubtree(int snapshotId, int priorSnapshotId, } @Override - public byte getStoragePolicyID(int snapshotId) { + public byte getStoragePolicyID(){ + return BlockStoragePolicy.ID_UNSPECIFIED; + } + + @Override + public byte getLocalStoragePolicyID() { return BlockStoragePolicy.ID_UNSPECIFIED; } }; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java index 16400002a2..cbd02fdb24 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeReference.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hdfs.protocol.QuotaExceededException; import org.apache.hadoop.hdfs.server.namenode.snapshot.DirectoryWithSnapshotFeature; import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot; -import org.apache.hadoop.hdfs.server.namenode.XAttrFeature; import com.google.common.base.Preconditions; @@ -287,8 +286,13 @@ public final void setAccessTime(long accessTime) { } @Override - public final byte getStoragePolicyID(int snapshotId) { - return referred.getStoragePolicyID(snapshotId); + public final byte getStoragePolicyID() { + return referred.getStoragePolicyID(); + } + + @Override + public final byte getLocalStoragePolicyID() { + return referred.getLocalStoragePolicyID(); } @Override diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeSymlink.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeSymlink.java index 5d29b5cc15..45a4bc82a9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeSymlink.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeSymlink.java @@ -147,7 +147,13 @@ public void addXAttrFeature(XAttrFeature f) { } @Override - public byte getStoragePolicyID(int snapshotId) { + public byte getStoragePolicyID() { + throw new UnsupportedOperationException( + "Storage policy are not supported on symlinks"); + } + + @Override + public byte getLocalStoragePolicyID() { throw new UnsupportedOperationException( "Storage policy are not supported on symlinks"); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java index ff5e995a2f..9fdc8cfc81 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java @@ -26,11 +26,13 @@ import java.util.List; import java.util.Map; +import com.google.common.collect.Lists; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hdfs.protocol.DirectoryListing; +import org.apache.hadoop.hdfs.protocol.*; import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction; -import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; +import org.apache.hadoop.hdfs.server.datanode.DataNode; +import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils; import org.apache.hadoop.hdfs.server.namenode.snapshot.SnapshotTestHelper; import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.test.GenericTestUtils; @@ -45,6 +47,8 @@ public class TestBlockStoragePolicy { static { conf = new HdfsConfiguration(); + conf.setLong(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 1); + conf.setInt(DFSConfigKeys.DFS_NAMENODE_REPLICATION_INTERVAL_KEY, 1); POLICY_SUITE = BlockStoragePolicy.readBlockStorageSuite(conf); DEFAULT_STORAGE_POLICY = POLICY_SUITE.getDefaultPolicy(); } @@ -872,11 +876,12 @@ public void testSetStoragePolicyWithSnapshot() throws Exception { HdfsFileStatus.EMPTY_NAME).getPartialListing(); checkDirectoryListing(fooList, COLD, WARM); - // check the policy for /dir/.snapshot/s1/foo/f1 + // check the policy for /dir/.snapshot/s1/foo/f1. Note we always return + // the latest storage policy for a file/directory. Path s1f1 = SnapshotTestHelper.getSnapshotPath(dir, "s1", "foo/f1"); DirectoryListing f1Listing = fs.getClient().listPaths(s1f1.toString(), HdfsFileStatus.EMPTY_NAME); - checkDirectoryListing(f1Listing.getPartialListing(), WARM); + checkDirectoryListing(f1Listing.getPartialListing(), COLD); // delete f1 fs.delete(fooFile1, true); @@ -885,7 +890,7 @@ public void testSetStoragePolicyWithSnapshot() throws Exception { checkDirectoryListing(fooList, WARM); // check the policy for /dir/.snapshot/s1/foo/f1 again after the deletion checkDirectoryListing(fs.getClient().listPaths(s1f1.toString(), - HdfsFileStatus.EMPTY_NAME).getPartialListing(), WARM); + HdfsFileStatus.EMPTY_NAME).getPartialListing(), COLD); // change the storage policy of foo dir fs.setStoragePolicy(fooDir, "HOT"); @@ -902,21 +907,126 @@ public void testSetStoragePolicyWithSnapshot() throws Exception { Path s1 = SnapshotTestHelper.getSnapshotRoot(dir, "s1"); Path s1foo = SnapshotTestHelper.getSnapshotPath(dir, "s1", "foo"); checkDirectoryListing(fs.getClient().listPaths(s1.toString(), - HdfsFileStatus.EMPTY_NAME).getPartialListing(), WARM); - // /dir/.snapshot/.s1/foo/f1 and /dir/.snapshot/.s1/foo/f2 are warm + HdfsFileStatus.EMPTY_NAME).getPartialListing(), HOT); + // /dir/.snapshot/.s1/foo/f1 and /dir/.snapshot/.s1/foo/f2 should still + // follow the latest checkDirectoryListing(fs.getClient().listPaths(s1foo.toString(), - HdfsFileStatus.EMPTY_NAME).getPartialListing(), WARM, WARM); + HdfsFileStatus.EMPTY_NAME).getPartialListing(), COLD, HOT); // delete foo fs.delete(fooDir, true); checkDirectoryListing(fs.getClient().listPaths(s1.toString(), - HdfsFileStatus.EMPTY_NAME).getPartialListing(), WARM); + HdfsFileStatus.EMPTY_NAME).getPartialListing(), HOT); checkDirectoryListing(fs.getClient().listPaths(s1foo.toString(), - HdfsFileStatus.EMPTY_NAME).getPartialListing(), WARM, WARM); + HdfsFileStatus.EMPTY_NAME).getPartialListing(), COLD, HOT); } finally { if (cluster != null) { cluster.shutdown(); } } } + + private static StorageType[][] genStorageTypes(int numDataNodes) { + StorageType[][] types = new StorageType[numDataNodes][]; + for (int i = 0; i < types.length; i++) { + types[i] = new StorageType[]{StorageType.DISK, StorageType.ARCHIVE}; + } + return types; + } + + private void checkLocatedBlocks(HdfsLocatedFileStatus status, int blockNum, + int replicaNum, StorageType... types) { + List typeList = Lists.newArrayList(); + for (StorageType type : types) { + typeList.add(type); + } + LocatedBlocks lbs = status.getBlockLocations(); + Assert.assertEquals(blockNum, lbs.getLocatedBlocks().size()); + for (LocatedBlock lb : lbs.getLocatedBlocks()) { + Assert.assertEquals(replicaNum, lb.getStorageTypes().length); + for (StorageType type : lb.getStorageTypes()) { + Assert.assertTrue(typeList.remove(type)); + } + } + Assert.assertTrue(typeList.isEmpty()); + } + + private void testIncreaseFileRep(String policyName, byte policyId, + StorageType[] before, + StorageType[] after) throws Exception { + final int numDataNodes = 5; + final StorageType[][] types = genStorageTypes(numDataNodes); + final MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf) + .numDataNodes(numDataNodes).storageTypes(types).build(); + cluster.waitActive(); + final DistributedFileSystem fs = cluster.getFileSystem(); + try { + final Path dir = new Path("/test"); + fs.mkdirs(dir); + fs.setStoragePolicy(dir, policyName); + + final Path foo = new Path(dir, "foo"); + DFSTestUtil.createFile(fs, foo, FILE_LEN, REPLICATION, 0L); + + // the storage policy of foo should be WARM, and the replicas + // should be stored in DISK and ARCHIE + HdfsFileStatus[] status = fs.getClient().listPaths(foo.toString(), + HdfsFileStatus.EMPTY_NAME, true).getPartialListing(); + checkDirectoryListing(status, policyId); + HdfsLocatedFileStatus fooStatus = (HdfsLocatedFileStatus) status[0]; + checkLocatedBlocks(fooStatus, 1, 3, before); + + // change the replication factor to 5 + fs.setReplication(foo, (short) numDataNodes); + Thread.sleep(1000); + for (DataNode dn : cluster.getDataNodes()) { + DataNodeTestUtils.triggerHeartbeat(dn); + } + Thread.sleep(1000); + status = fs.getClient().listPaths(foo.toString(), + HdfsFileStatus.EMPTY_NAME, true).getPartialListing(); + checkDirectoryListing(status, policyId); + fooStatus = (HdfsLocatedFileStatus) status[0]; + checkLocatedBlocks(fooStatus, 1, 5, after); + } finally { + cluster.shutdown(); + } + } + + /** + * Consider a File with Hot storage policy. Increase replication factor of + * that file from 3 to 5. Make sure all replications are created in DISKS. + */ + @Test + public void testIncreaseHotFileRep() throws Exception { + testIncreaseFileRep("HOT", HOT, new StorageType[]{StorageType.DISK, + StorageType.DISK, StorageType.DISK}, + new StorageType[]{StorageType.DISK, StorageType.DISK, + StorageType.DISK, StorageType.DISK, StorageType.DISK}); + } + + /** + * Consider a File with Warm temperature. Increase replication factor of + * that file from 3 to 5. Make sure all replicas are created in DISKS + * and ARCHIVE. + */ + @Test + public void testIncreaseWarmRep() throws Exception { + testIncreaseFileRep("WARM", WARM, new StorageType[]{StorageType.DISK, + StorageType.ARCHIVE, StorageType.ARCHIVE}, + new StorageType[]{StorageType.DISK, StorageType.ARCHIVE, + StorageType.ARCHIVE, StorageType.ARCHIVE, StorageType.ARCHIVE}); + } + + /** + * Consider a File with Cold temperature. Increase replication factor of + * that file from 3 to 5. Make sure all replicas are created in ARCHIVE. + */ + @Test + public void testIncreaseColdRep() throws Exception { + testIncreaseFileRep("COLD", COLD, new StorageType[]{StorageType.ARCHIVE, + StorageType.ARCHIVE, StorageType.ARCHIVE}, + new StorageType[]{StorageType.ARCHIVE, StorageType.ARCHIVE, + StorageType.ARCHIVE, StorageType.ARCHIVE, StorageType.ARCHIVE}); + } }