svn commit: r1489875 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs
Author: szetszwo Date: Wed Jun 5 13:53:12 2013 New Revision: 1489875 URL: http://svn.apache.org/r1489875 Log: svn merge -c -1489709 for reverting HDFS-4876. Added: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java - copied unchanged from r1489708, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props changed) hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ (props changed) hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshot.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotFSImageFormat.java Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ -- Reverse-merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1489708 Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1489875&r1=1489874&r2=1489875&view=diff == --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5 13:53:12 2013 @@ -829,9 +829,6 @@ Release 2.1.0-beta - UNRELEASED HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk. (Chris Nauroth via szetszwo) -HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to -FileWithSnapshot. (szetszwo) - Release 2.0.5-alpha - UNRELEASED INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ -- Reverse-merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1489708 Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java?rev=1489875&r1=1489874&r2=1489875&view=diff == --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java Wed Jun 5 13:53:12 2013 @@ -50,7 +50,7 @@ import org.apache.hadoop.hdfs.protocol.L import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo; import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager; import org.apache.hadoop.hdfs.server.common.InconsistentFSStateException; -import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiffList; +import org.apache.hadoop.hdfs.server.namenode.snapshot.FileDiffList; import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectorySnapshottable; import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectoryWithSnapshot; import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeFileUnderConstructionWithSnapshot; Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java?rev=1489875&r1=1489874&r2=1489875&view=diff == --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-pr
svn commit: r1489895 - /hadoop/common/branches/branch-0.23.8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Author: tgraves Date: Wed Jun 5 14:49:16 2013 New Revision: 1489895 URL: http://svn.apache.org/r1489895 Log: Updating release date for 0.23.8 Modified: hadoop/common/branches/branch-0.23.8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/branches/branch-0.23.8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1489895&r1=1489894&r2=1489895&view=diff == --- hadoop/common/branches/branch-0.23.8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23.8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5 14:49:16 2013 @@ -1,6 +1,6 @@ Hadoop HDFS Change Log -Release 0.23.8 - UNRELEASED +Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES
svn commit: r1489897 - /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Author: tgraves Date: Wed Jun 5 14:50:31 2013 New Revision: 1489897 URL: http://svn.apache.org/r1489897 Log: Updating release date for 0.23.8 Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1489897&r1=1489896&r2=1489897&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5 14:50:31 2013 @@ -12,7 +12,7 @@ Release 0.23.9 - UNRELEASED BUG FIXES -Release 0.23.8 - UNRELEASED +Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES
svn commit: r1489902 - /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Author: tgraves Date: Wed Jun 5 15:01:24 2013 New Revision: 1489902 URL: http://svn.apache.org/r1489902 Log: Updating release date for 0.23.8 Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1489902&r1=1489901&r2=1489902&view=diff == --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5 15:01:24 2013 @@ -2904,7 +2904,19 @@ Release 2.0.0-alpha - 05-23-2012 HDFS-3039. Address findbugs and javadoc warnings on branch. (todd via atm) -Release 0.23.8 - UNRELEASED +Release 0.23.9 - UNRELEASED + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + +Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES @@ -2932,7 +2944,7 @@ Release 0.23.8 - UNRELEASED HDFS-4807. createSocketForPipeline() should not include timeout extension on connect. (Cristina L. Abad via kihwal) -Release 0.23.7 - UNRELEASED +Release 0.23.7 - 2013-04-08 INCOMPATIBLE CHANGES @@ -2980,7 +2992,7 @@ Release 0.23.7 - UNRELEASED HDFS-4548. Webhdfs doesn't renegotiate SPNEGO token (daryn via kihwal) -Release 0.23.6 - UNRELEASED +Release 0.23.6 - 2013-02-06 INCOMPATIBLE CHANGES
svn commit: r1489907 - /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Author: tgraves Date: Wed Jun 5 15:05:43 2013 New Revision: 1489907 URL: http://svn.apache.org/r1489907 Log: Updating release date for 0.23.8 Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1489907&r1=1489906&r2=1489907&view=diff == --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5 15:05:43 2013 @@ -3096,7 +3096,19 @@ Release 2.0.0-alpha - 05-23-2012 HDFS-3039. Address findbugs and javadoc warnings on branch. (todd via atm) -Release 0.23.8 - UNRELEASED +Release 0.23.9 - UNRELEASED + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + +Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES @@ -3124,7 +3136,7 @@ Release 0.23.8 - UNRELEASED HDFS-4807. createSocketForPipeline() should not include timeout extension on connect. (Cristina L. Abad via kihwal) -Release 0.23.7 - UNRELEASED +Release 0.23.7 - 2013-04-18 INCOMPATIBLE CHANGES @@ -3172,7 +3184,7 @@ Release 0.23.7 - UNRELEASED HDFS-4548. Webhdfs doesn't renegotiate SPNEGO token (daryn via kihwal) -Release 0.23.6 - UNRELEASED +Release 0.23.6 - 2013-02-06 INCOMPATIBLE CHANGES
svn commit: r1489909 - /hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Author: tgraves Date: Wed Jun 5 15:10:26 2013 New Revision: 1489909 URL: http://svn.apache.org/r1489909 Log: Updating release date for 0.23.8 Modified: hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1489909&r1=1489908&r2=1489909&view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5 15:10:26 2013 @@ -2877,7 +2877,19 @@ Release 2.0.0-alpha - 05-23-2012 HDFS-3039. Address findbugs and javadoc warnings on branch. (todd via atm) -Release 0.23.8 - UNRELEASED +Release 0.23.9 - UNRELEASED + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + +Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES @@ -2905,7 +2917,7 @@ Release 0.23.8 - UNRELEASED HDFS-4807. createSocketForPipeline() should not include timeout extension on connect. (Cristina L. Abad via kihwal) -Release 0.23.7 - UNRELEASED +Release 0.23.7 - 2013-04-18 INCOMPATIBLE CHANGES @@ -2953,7 +2965,7 @@ Release 0.23.7 - UNRELEASED HDFS-4548. Webhdfs doesn't renegotiate SPNEGO token (daryn via kihwal) -Release 0.23.6 - UNRELEASED +Release 0.23.6 - 2013-02-06 INCOMPATIBLE CHANGES
svn commit: r1490080 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/
Author: jing9
Date: Wed Jun 5 23:32:53 2013
New Revision: 1490080
URL: http://svn.apache.org/r1490080
Log:
HDFS-4850. Fix OfflineImageViewer to work on fsimages with empty files or
snapshots. Contributed by Jing Zhao.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageVisitor.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TextWriterImageVisitor.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/XmlImageVisitor.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1490080&r1=1490079&r2=1490080&view=diff
==
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5
23:32:53 2013
@@ -1053,6 +1053,9 @@ Release 2.1.0-beta - UNRELEASED
HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to
FileWithSnapshot. (szetszwo)
+HDFS-4850. Fix OfflineImageViewer to work on fsimages with empty files or
+snapshots. (jing9)
+
Release 2.0.5-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java?rev=1490080&r1=1490079&r2=1490080&view=diff
==
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
Wed Jun 5 23:32:53 2013
@@ -186,7 +186,7 @@ public class INodesInPath {
// check if the next byte[] in components is for ".snapshot"
if (isDotSnapshotDir(childName)
- && isDir && dir instanceof INodeDirectoryWithSnapshot) {
+ && isDir && dir instanceof INodeDirectorySnapshottable) {
// skip the ".snapshot" in components
count++;
index++;
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java?rev=1490080&r1=1490079&r2=1490080&view=diff
==
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
Wed Jun 5 23:32:53 2013
@@ -177,7 +177,11 @@ class ImageLoaderCurrent implements Imag
imageVersion);
if (supportSnapshot) {
v.visit(ImageElement.SNAPSHOT_COUNTER, in.readInt());
-v.visit(ImageElement.NUM_SNAPSHOTS_TOTAL, in.readInt());
+int numSnapshots = in.readInt();
+v.visit(ImageElement.NUM_SNAPSHOTS_TOTAL, numSnapshots);
+for (int i = 0; i < numSnapshots; i++) {
+ processSnapshot(in, v);
+}
}
if (LayoutVersion.supports(Feature.FSIMAGE_COMPRESSION, imageVersion)) {
@@ -335,8 +339,8 @@ class ImageLoaderCurrent implements Imag
v.visitEnclosingElement(ImageElement.BLOCKS,
ImageElement.NUM_BLOCKS, numBlocks);
-// directory or symlink, no blocks to process
-if(numBlocks == -1 || numBlocks == -2) {
+// directory or symlink or reference node, no blocks to process
+if(numBlocks < 0) {
v.
svn commit: r1490084 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/tools/offlineI
Author: jing9
Date: Wed Jun 5 23:42:11 2013
New Revision: 1490084
URL: http://svn.apache.org/r1490084
Log:
HDFS-4850. Merging change r1490080 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageVisitor.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TextWriterImageVisitor.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/XmlImageVisitor.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1490084&r1=1490083&r2=1490084&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Jun 5 23:42:11 2013
@@ -829,6 +829,9 @@ Release 2.1.0-beta - UNRELEASED
HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log
flushes when running on virtualized disk. (Chris Nauroth via szetszwo)
+HDFS-4850. Fix OfflineImageViewer to work on fsimages with empty files or
+snapshots. (jing9)
+
Release 2.0.5-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java?rev=1490084&r1=1490083&r2=1490084&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java
Wed Jun 5 23:42:11 2013
@@ -186,7 +186,7 @@ public class INodesInPath {
// check if the next byte[] in components is for ".snapshot"
if (isDotSnapshotDir(childName)
- && isDir && dir instanceof INodeDirectoryWithSnapshot) {
+ && isDir && dir instanceof INodeDirectorySnapshottable) {
// skip the ".snapshot" in components
count++;
index++;
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java?rev=1490084&r1=1490083&r2=1490084&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
Wed Jun 5 23:42:11 2013
@@ -177,7 +177,11 @@ class ImageLoaderCurrent implements Imag
imageVersion);
if (supportSnapshot) {
v.visit(ImageElement.SNAPSHOT_COUNTER, in.readInt());
-v.visit(ImageElement.NUM_SNAPSHOTS_TOTAL, in.readInt());
+int numSnapshots = in.readInt();
+v.visit(ImageElement.NUM_SNAPSHOTS_TOTAL, numSnapshots);
+for (int i = 0; i < numSnapshots; i++) {
+ processSnapshot(in, v);
+}
}
if (LayoutVersion.supports(Feature.FSIMAGE_COMPRESSION, imageVersion)) {
@@ -335,8 +339,8 @@ class ImageLoaderCurrent implements Imag
v.visitEnclosingElement(ImageElement.BLOCKS,
ImageElement.NUM_BLOCKS, n
svn commit: r1490085 - /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Author: jing9 Date: Wed Jun 5 23:44:07 2013 New Revision: 1490085 URL: http://svn.apache.org/r1490085 Log: HDFS-4053. Move the jira description to release 2.1.0 section Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1490085&r1=1490084&r2=1490085&view=diff == --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jun 5 23:44:07 2013 @@ -4,8 +4,6 @@ Trunk (Unreleased) INCOMPATIBLE CHANGES -HDFS-4053. Increase the default block size. (eli) - HDFS-3034. Remove the deprecated DFSOutputStream.sync() method. (szetszwo) NEW FEATURES @@ -245,6 +243,8 @@ Release 2.1.0-beta - UNRELEASED INCOMPATIBLE CHANGES +HDFS-4053. Increase the default block size. (eli) + HDFS-4305. Add a configurable limit on number of blocks per file, and min block size. (Andrew Wang via atm)
svn commit: r1490115 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java src/test/java/org/apac
Author: suresh
Date: Thu Jun 6 03:29:43 2013
New Revision: 1490115
URL: http://svn.apache.org/r1490115
Log:
HADOOP-8957. Merge r1420965 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1490115&r1=1490114&r2=1490115&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Jun 6 03:29:43 2013
@@ -345,6 +345,9 @@ Release 2.1.0-beta - UNRELEASED
HDFS-4815. TestRBWBlockInvalidation: Double call countReplicas() to fetch
corruptReplicas and liveReplicas is not needed. (Tian Hong Wang via atm)
+HADOOP-8957 HDFS tests for AbstractFileSystem#IsValidName should be
overridden for
+embedded file systems like ViewFs (Chris Nauroth via Sanjay Radia)
+
BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS
HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java?rev=1490115&r1=1490114&r2=1490115&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
Thu Jun 6 03:29:43 2013
@@ -257,7 +257,22 @@ public class TestHDFSFileContextMainOper
Assert.assertFalse(fs.exists(src1)); // ensure src1 is already renamed
Assert.assertTrue(fs.exists(dst1));// ensure rename dst exists
}
-
+
+ @Test
+ public void testIsValidNameInvalidNames() {
+String[] invalidNames = {
+ "/foo/../bar",
+ "/foo/./bar",
+ "/foo/:/bar",
+ "/foo:bar"
+};
+
+for (String invalidName: invalidNames) {
+ Assert.assertFalse(invalidName + " is not valid",
+fc.getDefaultFileSystem().isValidName(invalidName));
+}
+ }
+
private void oldRename(Path src, Path dst, boolean renameSucceeds,
boolean exception) throws Exception {
DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java?rev=1490115&r1=1490114&r2=1490115&view=diff
==
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
Thu Jun 6 03:29:43 2013
@@ -640,9 +640,12 @@ public class TestDFSUtil {
@Test (timeout=15000)
public void testIsValidName() {
assertFalse(DFSUtil.isValidName("/foo/../bar"));
+assertFalse(DFSUtil.isValidName("/foo/./bar"));
assertFalse(DFSUtil.isValidName("/foo//bar"));
assertTrue(DFSUtil.isValidName("/"));
assertTrue(DFSUtil.isValidName("/bar/"));
+assertFalse(DFSUtil.isValidName("/foo/:/bar"));
+assertFalse(DFSUtil.isValidName("/foo:bar"));
}
@Test(timeout=5000)
svn commit: r1490117 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/server/namenod
Author: szetszwo Date: Thu Jun 6 03:35:03 2013 New Revision: 1490117 URL: http://svn.apache.org/r1490117 Log: HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot. Removed: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshot.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotFSImageFormat.java Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1490117&r1=1490116&r2=1490117&view=diff == --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Jun 6 03:35:03 2013 @@ -832,6 +832,9 @@ Release 2.1.0-beta - UNRELEASED HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk. (Chris Nauroth via szetszwo) +HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to +FileWithSnapshot. (szetszwo) + HDFS-4850. Fix OfflineImageViewer to work on fsimages with empty files or snapshots. (jing9) Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java?rev=1490117&r1=1490116&r2=1490117&view=diff == --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java Thu Jun 6 03:35:03 2013 @@ -50,7 +50,7 @@ import org.apache.hadoop.hdfs.protocol.L import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo; import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager; import org.apache.hadoop.hdfs.server.common.InconsistentFSStateException; -import org.apache.hadoop.hdfs.server.namenode.snapshot.FileDiffList; +import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiffList; import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectorySnapshottable; import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectoryWithSnapshot; import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeFileUnderConstructionWithSnapshot; Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java?rev=1490117&r1=1490116&r2=1490117&view=diff == --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java Thu Jun 6 03:35:03 2013 @@ -31,9 +31,9 @@ import org.apache.hadoop.hdfs.server.blo import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo; import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoUnderConstruction; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor; -import org.apache.hadoop.hdfs.server.namenode.snapshot.FileDiffList; import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot; import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiff; +import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiffList; import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.Uti
svn commit: r1490119 - /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Author: suresh Date: Thu Jun 6 03:51:13 2013 New Revision: 1490119 URL: http://svn.apache.org/r1490119 Log: Move HADOP-9131, HADOOP-8957 to release 2.0.1 section and HADOOP-9607, HADOOP-9605 to BUG FIXES Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1490119&r1=1490118&r2=1490119&view=diff == --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Jun 6 03:51:13 2013 @@ -209,9 +209,6 @@ Trunk (Unreleased) HDFS-4260 Fix HDFS tests to set test dir to a valid HDFS path as opposed to the local build path (Chri Nauroth via Sanjay) -HADOOP-8957 HDFS tests for AbstractFileSystem#IsValidName should be overridden for -embedded file systems like ViewFs (Chris Nauroth via Sanjay Radia) - HDFS-4310. fix test org.apache.hadoop.hdfs.server.datanode. TestStartSecureDataNode (Ivan A. Veselovsky via atm) @@ -566,6 +563,9 @@ Release 2.1.0-beta - UNRELEASED HDFS-4815. TestRBWBlockInvalidation: Double call countReplicas() to fetch corruptReplicas and liveReplicas is not needed. (Tian Hong Wang via atm) +HADOOP-8957 HDFS tests for AbstractFileSystem#IsValidName should be overridden for +embedded file systems like ViewFs (Chris Nauroth via Sanjay Radia) + BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.
svn commit: r1490151 - in /hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java src/test/java/o
Author: suresh
Date: Thu Jun 6 05:34:11 2013
New Revision: 1490151
URL: http://svn.apache.org/r1490151
Log:
Merge r1490115 for HADOOP-8957, r1490118 for HADOOP-9131, r1490121 for
HADOOP-9526, r1490125 for HADOOP-8982, r1490147 for HADOOP-8958 from branch-2
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1490151&r1=1490150&r2=1490151&view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Jun 6 05:34:11 2013
@@ -318,6 +318,9 @@ Release 2.1.0-beta - UNRELEASED
HDFS-4840. ReplicationMonitor gets NPE during shutdown. (kihwal)
+HADOOP-8957 HDFS tests for AbstractFileSystem#IsValidName should be
overridden for
+embedded file systems like ViewFs (Chris Nauroth via Sanjay Radia)
+
BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS
HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java?rev=1490151&r1=1490150&r2=1490151&view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
Thu Jun 6 05:34:11 2013
@@ -257,7 +257,22 @@ public class TestHDFSFileContextMainOper
Assert.assertFalse(fs.exists(src1)); // ensure src1 is already renamed
Assert.assertTrue(fs.exists(dst1));// ensure rename dst exists
}
-
+
+ @Test
+ public void testIsValidNameInvalidNames() {
+String[] invalidNames = {
+ "/foo/../bar",
+ "/foo/./bar",
+ "/foo/:/bar",
+ "/foo:bar"
+};
+
+for (String invalidName: invalidNames) {
+ Assert.assertFalse(invalidName + " is not valid",
+fc.getDefaultFileSystem().isValidName(invalidName));
+}
+ }
+
private void oldRename(Path src, Path dst, boolean renameSucceeds,
boolean exception) throws Exception {
DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java?rev=1490151&r1=1490150&r2=1490151&view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
Thu Jun 6 05:34:11 2013
@@ -640,9 +640,12 @@ public class TestDFSUtil {
@Test (timeout=15000)
public void testIsValidName() {
assertFalse(DFSUtil.isValidName("/foo/../bar"));
+assertFalse(DFSUtil.isValidName("/foo/./bar"));
assertFalse(DFSUtil.isValidName("/foo//bar"));
assertTrue(DFSUtil.isValidName("/"));
assertTrue(DFSUtil.isValidName("/bar/"));
+assertFalse(DFSUtil.isValidName("/foo/:/bar"));
+assertFalse(DFSUtil.isValidName("/foo:bar"));
}
@Test(timeout=5000)
