Author: kihwal
Date: Thu Feb 20 16:18:18 2014
New Revision: 1570256
URL: http://svn.apache.org/r1570256
Log:
svn merge -c 1570255 merging from branch-2 to branch-2.4 to fix:HDFS-5962.
Mtime and atime are not persisted for symbolic links.
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1570256&r1=1570255&r2=1570256&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Feb 20 16:18:18 2014
@@ -196,6 +196,9 @@ Release 2.4.0 - UNRELEASED
HDFS-5979. Typo and logger fix for fsimage PB code. (wang)
+ HDFS-5962. Mtime and atime are not persisted for symbolic links. (Akira
+ Ajisaka via kihwal)
+
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java?rev=1570256&r1=1570255&r2=1570256&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
Thu Feb 20 16:18:18 2014
@@ -227,8 +227,10 @@ public final class FSImageFormatPBINode
INodeSection.INodeSymlink s = n.getSymlink();
final PermissionStatus permissions = loadPermission(s.getPermission(),
parent.getLoaderContext().getStringTable());
- return new INodeSymlink(n.getId(), n.getName().toByteArray(),
permissions,
- 0, 0, s.getTarget().toStringUtf8());
+ INodeSymlink sym = new INodeSymlink(n.getId(), n.getName().toByteArray(),
+ permissions, s.getModificationTime(), s.getAccessTime(),
+ s.getTarget().toStringUtf8());
+ return sym;
}
private void loadRootINode(INodeSection.INode p) {
@@ -408,7 +410,9 @@ public final class FSImageFormatPBINode
INodeSection.INodeSymlink.Builder b = INodeSection.INodeSymlink
.newBuilder()
.setPermission(buildPermissionStatus(n,
parent.getSaverContext().getStringMap()))
- .setTarget(ByteString.copyFrom(n.getSymlink()));
+ .setTarget(ByteString.copyFrom(n.getSymlink()))
+ .setModificationTime(n.getModificationTime())
+ .setAccessTime(n.getAccessTime());
INodeSection.INode r = buildINodeCommon(n)
.setType(INodeSection.INode.Type.SYMLINK).setSymlink(b).build();
r.writeDelimitedTo(out);
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java?rev=1570256&r1=1570255&r2=1570256&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java
Thu Feb 20 16:18:18 2014
@@ -170,8 +170,9 @@ final class LsrPBImage {
PermissionStatus p = FSImageFormatPBINode.Loader.loadPermission(
d.getPermission(), stringTable);
out.print(String.format("-%s - %8s %10s %10s %10d %s%s -> %s\n", p
- .getPermission().toString(), p.getUserName(), p.getGroupName(), 0, 0,
- parent, inode.getName().toStringUtf8(),
d.getTarget().toStringUtf8()));
+ .getPermission().toString(), p.getUserName(), p.getGroupName(), d
+ .getModificationTime(), 0, parent, inode.getName().toStringUtf8(),
+ d.getTarget().toStringUtf8()));
}
break;
default:
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java?rev=1570256&r1=1570255&r2=1570256&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
Thu Feb 20 16:18:18 2014
@@ -289,8 +289,9 @@ public final class PBImageXmlWriter {
}
private void dumpINodeSymlink(INodeSymlink s) {
- o("permission", dumpPermission(s.getPermission())).o("target",
- s.getTarget().toStringUtf8());
+ o("permission", dumpPermission(s.getPermission()))
+ .o("target", s.getTarget().toStringUtf8())
+ .o("mtime", s.getModificationTime()).o("atime", s.getAccessTime());
}
private void dumpNameSection(InputStream in) throws IOException {
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto?rev=1570256&r1=1570255&r2=1570256&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
Thu Feb 20 16:18:18 2014
@@ -110,6 +110,8 @@ message INodeSection {
message INodeSymlink {
optional fixed64 permission = 1;
optional bytes target = 2;
+ optional uint64 modificationTime = 3;
+ optional uint64 accessTime = 4;
}
message INode {
@@ -281,4 +283,3 @@ message CacheManagerSection {
// repeated CachePoolInfoProto pools
// repeated CacheDirectiveInfoProto directives
}
-
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java?rev=1570256&r1=1570255&r2=1570256&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImage.java
Thu Feb 20 16:18:18 2014
@@ -34,6 +34,7 @@ import org.apache.hadoop.hdfs.DFSOutputS
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.client.HdfsDataOutputStream.SyncFlag;
+import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.BlockUCState;
@@ -135,4 +136,51 @@ public class TestFSImage {
}
}
}
+
+ /**
+ * Ensure mtime and atime can be loaded from fsimage.
+ */
+ @Test(timeout=60000)
+ public void testLoadMtimeAtime() throws Exception {
+ Configuration conf = new Configuration();
+ MiniDFSCluster cluster = null;
+ try {
+ cluster = new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
+ cluster.waitActive();
+ DistributedFileSystem hdfs = cluster.getFileSystem();
+ String userDir = hdfs.getHomeDirectory().toUri().getPath().toString();
+ Path file = new Path(userDir, "file");
+ Path dir = new Path(userDir, "/dir");
+ Path link = new Path(userDir, "/link");
+ hdfs.createNewFile(file);
+ hdfs.mkdirs(dir);
+ hdfs.createSymlink(file, link, false);
+
+ long mtimeFile = hdfs.getFileStatus(file).getModificationTime();
+ long atimeFile = hdfs.getFileStatus(file).getAccessTime();
+ long mtimeDir = hdfs.getFileStatus(dir).getModificationTime();
+ long mtimeLink = hdfs.getFileLinkStatus(link).getModificationTime();
+ long atimeLink = hdfs.getFileLinkStatus(link).getAccessTime();
+
+ // save namespace and restart cluster
+ hdfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
+ hdfs.saveNamespace();
+ hdfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_LEAVE);
+ cluster.shutdown();
+ cluster = new MiniDFSCluster.Builder(conf).format(false)
+ .numDataNodes(1).build();
+ cluster.waitActive();
+ hdfs = cluster.getFileSystem();
+
+ assertEquals(mtimeFile, hdfs.getFileStatus(file).getModificationTime());
+ assertEquals(atimeFile, hdfs.getFileStatus(file).getAccessTime());
+ assertEquals(mtimeDir, hdfs.getFileStatus(dir).getModificationTime());
+ assertEquals(mtimeLink,
hdfs.getFileLinkStatus(link).getModificationTime());
+ assertEquals(atimeLink, hdfs.getFileLinkStatus(link).getAccessTime());
+ } finally {
+ if (cluster != null) {
+ cluster.shutdown();
+ }
+ }
+ }
}
