You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by su...@apache.org on 2011/03/03 08:04:01 UTC
svn commit: r1076539 - in /hadoop/hdfs/branches/HDFS-1052: ./
src/c++/libhdfs/ src/contrib/hdfsproxy/ src/java/
src/java/org/apache/hadoop/fs/
src/java/org/apache/hadoop/hdfs/server/datanode/ src/test/hdfs/
src/webapps/datanode/ src/webapps/hdfs/ src/w...
Author: suresh
Date: Thu Mar 3 07:04:00 2011
New Revision: 1076539
URL: http://svn.apache.org/viewvc?rev=1076539&view=rev
Log:
Merging changes r1034500:1034544 from trunk to federation
Modified:
hadoop/hdfs/branches/HDFS-1052/ (props changed)
hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
hadoop/hdfs/branches/HDFS-1052/build.xml (props changed)
hadoop/hdfs/branches/HDFS-1052/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/HDFS-1052/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/HDFS-1052/src/java/ (props changed)
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/fs/Hdfs.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java (props changed)
hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/HDFS-1052/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/HDFS-1052/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/HDFS-1052/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/HDFS-1052/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1036738,1052823
+/hadoop/hdfs/trunk:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1036738,1052823
Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1076539&r1=1076538&r2=1076539&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Thu Mar 3 07:04:00 2011
@@ -362,6 +362,11 @@ Release 0.22.0 - Unreleased
HDFS-1408. Herriot NN and DN clients should vend statistics. (cos)
+ HDFS-1491 Update Hdfs to match the change of methods from protected to public
+ in AbstractFileSystem (Hadoop-6903) (sanjay)
+
+ HDFS-1160. Improve some FSDataset warnings and comments. (eli)
+
OPTIMIZATIONS
HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)
Propchange: hadoop/hdfs/branches/HDFS-1052/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/build.xml:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Propchange: hadoop/hdfs/branches/HDFS-1052/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/c++/libhdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Propchange: hadoop/hdfs/branches/HDFS-1052/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Propchange: hadoop/hdfs/branches/HDFS-1052/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/java:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/fs/Hdfs.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/fs/Hdfs.java?rev=1076539&r1=1076538&r2=1076539&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/fs/Hdfs.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/fs/Hdfs.java Thu Mar 3 07:04:00 2011
@@ -77,12 +77,12 @@ public class Hdfs extends AbstractFileSy
}
@Override
- protected int getUriDefaultPort() {
+ public int getUriDefaultPort() {
return NameNode.DEFAULT_PORT;
}
@Override
- protected FSDataOutputStream createInternal(Path f,
+ public FSDataOutputStream createInternal(Path f,
EnumSet<CreateFlag> createFlag, FsPermission absolutePermission,
int bufferSize, short replication, long blockSize, Progressable progress,
int bytesPerChecksum, boolean createParent) throws IOException {
@@ -92,25 +92,25 @@ public class Hdfs extends AbstractFileSy
}
@Override
- protected boolean delete(Path f, boolean recursive)
+ public boolean delete(Path f, boolean recursive)
throws IOException, UnresolvedLinkException {
return dfs.delete(getUriPath(f), recursive);
}
@Override
- protected BlockLocation[] getFileBlockLocations(Path p, long start, long len)
+ public BlockLocation[] getFileBlockLocations(Path p, long start, long len)
throws IOException, UnresolvedLinkException {
return dfs.getBlockLocations(getUriPath(p), start, len);
}
@Override
- protected FileChecksum getFileChecksum(Path f)
+ public FileChecksum getFileChecksum(Path f)
throws IOException, UnresolvedLinkException {
return dfs.getFileChecksum(getUriPath(f));
}
@Override
- protected FileStatus getFileStatus(Path f)
+ public FileStatus getFileStatus(Path f)
throws IOException, UnresolvedLinkException {
HdfsFileStatus fi = dfs.getFileInfo(getUriPath(f));
if (fi != null) {
@@ -155,17 +155,17 @@ public class Hdfs extends AbstractFileSy
}
@Override
- protected FsStatus getFsStatus() throws IOException {
+ public FsStatus getFsStatus() throws IOException {
return dfs.getDiskStatus();
}
@Override
- protected FsServerDefaults getServerDefaults() throws IOException {
+ public FsServerDefaults getServerDefaults() throws IOException {
return dfs.getServerDefaults();
}
@Override
- protected RemoteIterator<LocatedFileStatus> listLocatedStatus(
+ public RemoteIterator<LocatedFileStatus> listLocatedStatus(
final Path p)
throws FileNotFoundException, IOException {
return new DirListingIterator<LocatedFileStatus>(p, true) {
@@ -178,7 +178,7 @@ public class Hdfs extends AbstractFileSy
}
@Override
- protected RemoteIterator<FileStatus> listStatusIterator(final Path f)
+ public RemoteIterator<FileStatus> listStatusIterator(final Path f)
throws AccessControlException, FileNotFoundException,
UnresolvedLinkException, IOException {
return new DirListingIterator<FileStatus>(f, false) {
@@ -244,7 +244,7 @@ public class Hdfs extends AbstractFileSy
* @throws IOException if there is any error
* @throws NoSuchElmentException if no more entry is available
*/
- protected HdfsFileStatus getNext() throws IOException {
+ public HdfsFileStatus getNext() throws IOException {
if (hasNext()) {
return thisListing.getPartialListing()[i++];
}
@@ -253,7 +253,7 @@ public class Hdfs extends AbstractFileSy
}
@Override
- protected FileStatus[] listStatus(Path f)
+ public FileStatus[] listStatus(Path f)
throws IOException, UnresolvedLinkException {
String src = getUriPath(f);
@@ -304,74 +304,74 @@ public class Hdfs extends AbstractFileSy
}
@Override
- protected void mkdir(Path dir, FsPermission permission, boolean createParent)
+ public void mkdir(Path dir, FsPermission permission, boolean createParent)
throws IOException, UnresolvedLinkException {
dfs.mkdirs(getUriPath(dir), permission, createParent);
}
@Override
- protected FSDataInputStream open(Path f, int bufferSize)
+ public FSDataInputStream open(Path f, int bufferSize)
throws IOException, UnresolvedLinkException {
return new DFSClient.DFSDataInputStream(dfs.open(getUriPath(f),
bufferSize, verifyChecksum));
}
@Override
- protected void renameInternal(Path src, Path dst)
+ public void renameInternal(Path src, Path dst)
throws IOException, UnresolvedLinkException {
dfs.rename(getUriPath(src), getUriPath(dst));
}
@Override
- protected void renameInternal(Path src, Path dst, boolean overwrite)
+ public void renameInternal(Path src, Path dst, boolean overwrite)
throws IOException, UnresolvedLinkException {
dfs.rename(getUriPath(src), getUriPath(dst),
overwrite ? Options.Rename.OVERWRITE : Options.Rename.NONE);
}
@Override
- protected void setOwner(Path f, String username, String groupname)
+ public void setOwner(Path f, String username, String groupname)
throws IOException, UnresolvedLinkException {
dfs.setOwner(getUriPath(f), username, groupname);
}
@Override
- protected void setPermission(Path f, FsPermission permission)
+ public void setPermission(Path f, FsPermission permission)
throws IOException, UnresolvedLinkException {
dfs.setPermission(getUriPath(f), permission);
}
@Override
- protected boolean setReplication(Path f, short replication)
+ public boolean setReplication(Path f, short replication)
throws IOException, UnresolvedLinkException {
return dfs.setReplication(getUriPath(f), replication);
}
@Override
- protected void setTimes(Path f, long mtime, long atime)
+ public void setTimes(Path f, long mtime, long atime)
throws IOException, UnresolvedLinkException {
dfs.setTimes(getUriPath(f), mtime, atime);
}
@Override
- protected void setVerifyChecksum(boolean verifyChecksum)
+ public void setVerifyChecksum(boolean verifyChecksum)
throws IOException {
this.verifyChecksum = verifyChecksum;
}
@Override
- protected boolean supportsSymlinks() {
+ public boolean supportsSymlinks() {
return true;
}
@Override
- protected void createSymlink(Path target, Path link, boolean createParent)
+ public void createSymlink(Path target, Path link, boolean createParent)
throws IOException, UnresolvedLinkException {
dfs.createSymlink(target.toString(), getUriPath(link), createParent);
}
@Override
- protected Path getLinkTarget(Path p) throws IOException {
+ public Path getLinkTarget(Path p) throws IOException {
return new Path(dfs.getLinkTarget(getUriPath(p)));
}
}
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java?rev=1076539&r1=1076538&r2=1076539&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java Thu Mar 3 07:04:00 2011
@@ -958,7 +958,7 @@ class BlockReceiver implements java.io.C
try {
datanode.checkDiskError(e); // may throw an exception here
} catch (IOException ioe) {
- LOG.warn("DataNode.chekDiskError failed in run() with: ", ioe);
+ LOG.warn("DataNode.checkDiskError failed in run() with: ", ioe);
}
LOG.info("PacketResponder " + block + " " + numTargets +
" Exception " + StringUtils.stringifyException(e));
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1076539&r1=1076538&r2=1076539&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Thu Mar 3 07:04:00 2011
@@ -1620,9 +1620,11 @@ public class DataNode extends Configured
}
private void handleDiskError(String errMsgr) {
- boolean hasEnoughResources = data.hasEnoughResource();
+ final boolean hasEnoughResources = data.hasEnoughResource();
LOG.warn("DataNode.handleDiskError: Keep Running: " + hasEnoughResources);
+ // If we have enough active valid volumes then we do not want to
+ // shutdown the DN completely.
int dpError = hasEnoughResources ? DatanodeProtocol.DISK_ERROR
: DatanodeProtocol.FATAL_DISK_ERROR;
//inform NameNodes
@@ -1630,7 +1632,10 @@ public class DataNode extends Configured
DatanodeProtocol nn = bpos.bpNamenode;
try {
nn.errorReport(bpos.bpRegistration, dpError, errMsgr);
- } catch(IOException ignored) { }
+ } catch(IOException e) {
+ LOG.warn("Error reporting disk failure to NameNode: " +
+ StringUtils.stringifyException(e));
+ }
}
if(hasEnoughResources) {
@@ -1638,7 +1643,7 @@ public class DataNode extends Configured
return; // do not shutdown
}
- LOG.warn("DataNode is shutting down.\n" + errMsgr);
+ LOG.warn("DataNode is shutting down: " + errMsgr);
shouldRun = false;
}
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java?rev=1076539&r1=1076538&r2=1076539&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java Thu Mar 3 07:04:00 2011
@@ -802,14 +802,12 @@ public class FSDataset implements FSCons
}
/**
- * goes over all the volumes and checkDir eachone of them
- * if one throws DiskErrorException - removes from the list of active
- * volumes.
- * @return list of all the removed volumes
+ * Calls {@link FSVolume#checkDirs()} on each volume, removing any
+ * volumes from the active list that result in a DiskErrorException.
+ * @return list of all the removed volumes.
*/
synchronized List<FSVolume> checkDirs() {
-
- ArrayList<FSVolume> removed_vols = null;
+ ArrayList<FSVolume> removedVols = null;
for (int idx = 0; idx < volumes.length; idx++) {
FSVolume fsv = volumes[idx];
@@ -817,31 +815,30 @@ public class FSDataset implements FSCons
fsv.checkDirs();
} catch (DiskErrorException e) {
DataNode.LOG.warn("Removing failed volume " + fsv + ": ",e);
- if(removed_vols == null) {
- removed_vols = new ArrayList<FSVolume>(1);
+ if (removedVols == null) {
+ removedVols = new ArrayList<FSVolume>(1);
}
- removed_vols.add(volumes[idx]);
- volumes[idx] = null; //remove the volume
+ removedVols.add(volumes[idx]);
+ volumes[idx] = null; // Remove the volume
}
}
- // repair array - copy non null elements
- int removed_size = (removed_vols==null)? 0 : removed_vols.size();
- if(removed_size > 0) {
- FSVolume fsvs[] = new FSVolume [volumes.length-removed_size];
- for(int idx=0,idy=0; idx<volumes.length; idx++) {
- if(volumes[idx] != null) {
- fsvs[idy] = volumes[idx];
- idy++;
+ // Remove null volumes from the volumes array
+ if (removedVols != null && removedVols.size() > 0) {
+ FSVolume newVols[] = new FSVolume[volumes.length - removedVols.size()];
+ int i = 0;
+ for (FSVolume vol : volumes) {
+ if (vol != null) {
+ newVols[i++] = vol;
}
}
- volumes = fsvs; // replace array of volumes
+ volumes = newVols; // Replace array of volumes
DataNode.LOG.info("Completed FSVolumeSet.checkDirs. Removed "
- + removed_vols.size() + " volumes. List of current volumes: "
+ + removedVols.size() + " volumes. List of current volumes: "
+ this);
}
- return removed_vols;
+ return removedVols;
}
public String toString() {
@@ -1948,46 +1945,45 @@ public class FSDataset implements FSCons
*/
@Override // FSDatasetInterface
public void checkDataDir() throws DiskErrorException {
- long total_blocks=0, removed_blocks=0;
- List<FSVolume> failed_vols = volumes.checkDirs();
+ long totalBlocks=0, removedBlocks=0;
+ List<FSVolume> failedVols = volumes.checkDirs();
- //if there no failed volumes return
- if(failed_vols == null)
+ // If there no failed volumes return
+ if (failedVols == null) {
return;
+ }
- // else
- // remove related blocks
+ // Otherwise remove blocks for the failed volumes
long mlsec = System.currentTimeMillis();
synchronized (this) {
- for(FSVolume fv: failed_vols) {
+ for (FSVolume fv: failedVols) {
for (String bpid : fv.map.keySet()) {
Iterator<ReplicaInfo> ib = volumeMap.replicas(bpid).iterator();
while(ib.hasNext()) {
ReplicaInfo b = ib.next();
- total_blocks ++;
+ totalBlocks++;
// check if the volume block belongs to still valid
if(b.getVolume() == fv) {
- DataNode.LOG.warn("removing " + bpid + ":" + b.getBlockId()
- + " from vol " + fv.currentDir.getAbsolutePath());
+ DataNode.LOG.warn("Removing replica " + bpid + ":" + b.getBlockId()
+ + " on failed volume " + fv.currentDir.getAbsolutePath());
ib.remove();
- removed_blocks++;
+ removedBlocks++;
}
}
}
}
} // end of sync
mlsec = System.currentTimeMillis() - mlsec;
- DataNode.LOG.warn("Removed " + removed_blocks + " out of " + total_blocks +
+ DataNode.LOG.warn("Removed " + removedBlocks + " out of " + totalBlocks +
"(took " + mlsec + " millisecs)");
// report the error
StringBuilder sb = new StringBuilder();
- for(FSVolume fv : failed_vols) {
+ for (FSVolume fv : failedVols) {
sb.append(fv.currentDir.getAbsolutePath() + ";");
}
throw new DiskErrorException("DataNode failed volumes:" + sb);
-
}
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java?rev=1076539&r1=1076538&r2=1076539&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java Thu Mar 3 07:04:00 2011
@@ -322,8 +322,9 @@ public interface FSDatasetInterface exte
int checksumSize) throws IOException;
/**
- * checks how many valid storage volumes are there in the DataNode
- * @return true if more then minimum valid volumes left in the FSDataSet
+ * Checks how many valid storage volumes there are in the DataNode.
+ * @return true if more than the minimum number of valid volumes are left
+ * in the FSDataSet.
*/
public boolean hasEnoughResource();
Propchange: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Propchange: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/test/hdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Propchange: hadoop/hdfs/branches/HDFS-1052/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/webapps/datanode:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Propchange: hadoop/hdfs/branches/HDFS-1052/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/webapps/hdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823
Propchange: hadoop/hdfs/branches/HDFS-1052/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 07:04:00 2011
@@ -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:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1052823
+/hadoop/hdfs/trunk/src/webapps/secondary:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1052823