Author: eli
Date: Tue Nov 23 01:51:34 2010
New Revision: 1037963
URL: http://svn.apache.org/viewvc?rev=1037963&view=rev
Log:
HDFS-1513. svn merge -c 1037961 from trunk
Modified:
hadoop/hdfs/branches/branch-0.22/ (props changed)
hadoop/hdfs/branches/branch-0.22/CHANGES.txt
hadoop/hdfs/branches/branch-0.22/build.xml (props changed)
hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/java/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
(props changed)
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/fs/TestGlobPaths.java
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestLocalDFS.java
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestModTime.java
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs:713112
/hadoop/hdfs/branches/HDFS-265:796829-820463
/hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Tue Nov 23 01:51:34 2010
@@ -213,7 +213,9 @@ Release 0.22.0 - Unreleased
blocks are corrupt. (Patrick Kling via hairong)
HDFS-259. Remove intentionally corrupt 0.13 directory layout creation.
- (Todd Lipcon via eli).
+ (Todd Lipcon via eli)
+
+ HDFS-1513. Fix a number of warnings. (eli)
OPTIMIZATIONS
Propchange: hadoop/hdfs/branches/branch-0.22/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/build.xml:779102
/hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
/hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Propchange: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
/hadoop/core/trunk/src/c++/libhdfs:776175-784663
-/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Propchange: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/contrib/hdfsproxy:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487
-/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Propchange: hadoop/hdfs/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
/hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Modified:
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java
(original)
+++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java
Tue Nov 23 01:51:34 2010
@@ -319,7 +319,7 @@ public class Hdfs extends AbstractFileSy
@Override
public void renameInternal(Path src, Path dst)
throws IOException, UnresolvedLinkException {
- dfs.rename(getUriPath(src), getUriPath(dst));
+ dfs.rename(getUriPath(src), getUriPath(dst), Options.Rename.NONE);
}
@Override
Modified:
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
Tue Nov 23 01:51:34 2010
@@ -183,7 +183,7 @@ public class DistributedFileSystem exten
/** {...@inheritdoc} */
@Override
public Path getHomeDirectory() {
- return new Path("/user/" + dfs.ugi.getShortUserName()).makeQualified(this);
+ return makeQualified(new Path("/user/" + dfs.ugi.getShortUserName()));
}
private String getPathName(Path file) {
Modified:
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java
Tue Nov 23 01:51:34 2010
@@ -353,13 +353,13 @@ public class HftpFileSystem extends File
Long.valueOf(attrs.getValue("blocksize")).longValue(),
modif, atime, FsPermission.valueOf(attrs.getValue("permission")),
attrs.getValue("owner"), attrs.getValue("group"),
- new Path(getUri().toString(), attrs.getValue("path"))
- .makeQualified(HftpFileSystem.this))
+ HftpFileSystem.this.makeQualified(
+ new Path(getUri().toString(), attrs.getValue("path"))))
: new FileStatus(0L, true, 0, 0L,
modif, atime, FsPermission.valueOf(attrs.getValue("permission")),
attrs.getValue("owner"), attrs.getValue("group"),
- new Path(getUri().toString(), attrs.getValue("path"))
- .makeQualified(HftpFileSystem.this));
+ HftpFileSystem.this.makeQualified(
+ new Path(getUri().toString(), attrs.getValue("path"))));
fslist.add(fs);
}
Modified:
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
Tue Nov 23 01:51:34 2010
@@ -33,7 +33,6 @@ import java.util.LinkedList;
import java.util.zip.Checksum;
import org.apache.commons.logging.Log;
-import org.apache.hadoop.fs.FSInputChecker;
import org.apache.hadoop.fs.FSOutputSummer;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
@@ -695,6 +694,17 @@ class BlockReceiver implements java.io.C
}
/**
+ * Convert a checksum byte array to a long
+ */
+ static private long checksum2long(byte[] checksum) {
+ long crc = 0L;
+ for(int i=0; i<checksum.length; i++) {
+ crc |= (0xffL&(long)checksum[i])<<((checksum.length-i-1)*8);
+ }
+ return crc;
+ }
+
+ /**
* reads in the partial crc chunk and computes checksum
* of pre-existing data in partial chunk.
*/
@@ -735,11 +745,11 @@ class BlockReceiver implements java.io.C
// paranoia! verify that the pre-computed crc matches what we
// recalculated just now
- if (partialCrc.getValue() != FSInputChecker.checksum2long(crcbuf)) {
+ if (partialCrc.getValue() != checksum2long(crcbuf)) {
String msg = "Partial CRC " + partialCrc.getValue() +
" does not match value computed the " +
" last time file was closed " +
- FSInputChecker.checksum2long(crcbuf);
+ checksum2long(crcbuf);
throw new IOException(msg);
}
}
Propchange:
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -4,4 +4,4 @@
/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:776175-785643,785929-786278
/hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:820487
-/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Propchange: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/test/hdfs:776175-785643
/hadoop/hdfs/branches/HDFS-265/src/test/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/test/hdfs:820487
-/hadoop/hdfs/trunk/src/test/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/test/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Modified:
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/fs/TestGlobPaths.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/fs/TestGlobPaths.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/fs/TestGlobPaths.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/fs/TestGlobPaths.java
Tue Nov 23 01:51:34 2010
@@ -394,7 +394,7 @@ public class TestGlobPaths extends TestC
private Path[] prepareTesting(String pattern, String[] files)
throws IOException {
for(int i=0; i<Math.min(NUM_OF_PATHS, files.length); i++) {
- path[i] = new Path(files[i]).makeQualified(fs);
+ path[i] = fs.makeQualified(new Path(files[i]));
if (!fs.mkdirs(path[i])) {
throw new IOException("Mkdirs failed to create " + path[i].toString());
}
@@ -403,7 +403,8 @@ public class TestGlobPaths extends TestC
Path[] globResults = FileUtil.stat2Paths(fs.globStatus(patternPath),
patternPath);
for(int i=0; i<globResults.length; i++) {
- globResults[i] = globResults[i].makeQualified(fs);
+ globResults[i] =
+ globResults[i].makeQualified(fs.getUri(), fs.getWorkingDirectory());
}
return globResults;
}
@@ -411,7 +412,7 @@ public class TestGlobPaths extends TestC
private Path[] prepareTesting(String pattern, String[] files,
PathFilter filter) throws IOException {
for(int i=0; i<Math.min(NUM_OF_PATHS, files.length); i++) {
- path[i] = new Path(files[i]).makeQualified(fs);
+ path[i] = fs.makeQualified(new Path(files[i]));
if (!fs.mkdirs(path[i])) {
throw new IOException("Mkdirs failed to create " + path[i].toString());
}
@@ -420,7 +421,8 @@ public class TestGlobPaths extends TestC
Path[] globResults = FileUtil.stat2Paths(fs.globStatus(patternPath,
filter),
patternPath);
for(int i=0; i<globResults.length; i++) {
- globResults[i] = globResults[i].makeQualified(fs);
+ globResults[i] =
+ globResults[i].makeQualified(fs.getUri(), fs.getWorkingDirectory());
}
return globResults;
}
Modified:
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestLocalDFS.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestLocalDFS.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestLocalDFS.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestLocalDFS.java
Tue Nov 23 01:51:34 2010
@@ -82,8 +82,8 @@ public class TestLocalDFS extends TestCa
file1.toString()));
// test home directory
- Path home = new Path("/user/" + getUserName(fileSys))
- .makeQualified(fileSys);
+ Path home =
+ fileSys.makeQualified(new Path("/user/" + getUserName(fileSys)));
Path fsHome = fileSys.getHomeDirectory();
assertEquals(home, fsHome);
Modified:
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestModTime.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestModTime.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestModTime.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestModTime.java
Tue Nov 23 01:51:34 2010
@@ -124,7 +124,7 @@ public class TestModTime extends TestCas
//
// create another directory
//
- Path dir2 = (new Path("testdir2/")).makeQualified(fileSys);
+ Path dir2 = fileSys.makeQualified(new Path("testdir2/"));
System.out.println("Creating testdir2 " + dir2);
assertTrue(fileSys.mkdirs(dir2));
stat = fileSys.getFileStatus(dir2);
Modified:
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java
Tue Nov 23 01:51:34 2010
@@ -200,7 +200,7 @@ public class TestBlockTokenWithDFS exten
stm = fs.append(fileToAppend);
int mid = rawData.length - 1;
stm.write(rawData, 1, mid - 1);
- stm.sync();
+ stm.hflush();
/*
* wait till token used in stm expires
@@ -252,7 +252,7 @@ public class TestBlockTokenWithDFS exten
// write a partial block
int mid = rawData.length - 1;
stm.write(rawData, 0, mid);
- stm.sync();
+ stm.hflush();
/*
* wait till token used in stm expires
@@ -314,7 +314,7 @@ public class TestBlockTokenWithDFS exten
* testing READ interface on DN using a BlockReader
*/
- DFSClient dfsclient = new DFSClient(new InetSocketAddress("localhost",
+ new DFSClient(new InetSocketAddress("localhost",
cluster.getNameNodePort()), conf);
List<LocatedBlock> locatedBlocks =
cluster.getNameNode().getBlockLocations(
FILE_TO_READ, 0, FILE_SIZE).getLocatedBlocks();
Modified:
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java?rev=1037963&r1=1037962&r2=1037963&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
(original)
+++
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
Tue Nov 23 01:51:34 2010
@@ -75,6 +75,7 @@ class MockHttpServletResponse implements
status = sc;
}
+ @Deprecated
public void setStatus(int sc, java.lang.String sm) {
}
@@ -105,10 +106,12 @@ class MockHttpServletResponse implements
public void sendError(int a, java.lang.String b) {
}
+ @Deprecated
public String encodeRedirectUrl(java.lang.String a) {
return null;
}
+ @Deprecated
public String encodeUrl(java.lang.String url) {
return null;
}
@@ -117,6 +120,7 @@ class MockHttpServletResponse implements
return null;
}
+ @Deprecated
public String encodeURL(java.lang.String url) {
return null;
}
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/datanode:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487
-/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/hdfs:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487
-/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 23 01:51:34 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/secondary:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487
-/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109
+/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961
