Author: omalley
Date: Fri Jun 19 23:12:41 2009
New Revision: 786712
URL: http://svn.apache.org/viewvc?rev=786712&view=rev
Log:
HADOOP-4687. More merges from trunk.
Added:
hadoop/core/branches/HADOOP-4687/core/src/test/core/org/apache/hadoop/fs/TestBlockLocation.java
- copied unchanged from r786278,
hadoop/core/trunk/src/test/core/org/apache/hadoop/fs/TestBlockLocation.java
Modified:
hadoop/core/branches/HADOOP-4687/core/CHANGES.txt (contents, props
changed)
hadoop/core/branches/HADOOP-4687/core/src/docs/ (props changed)
hadoop/core/branches/HADOOP-4687/core/src/java/ (props changed)
hadoop/core/branches/HADOOP-4687/core/src/java/org/apache/hadoop/fs/BlockLocation.java
hadoop/core/branches/HADOOP-4687/core/src/test/core/ (props changed)
hadoop/core/branches/HADOOP-4687/hdfs/src/java/ (props changed)
hadoop/core/branches/HADOOP-4687/hdfs/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Modified: hadoop/core/branches/HADOOP-4687/core/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/core/CHANGES.txt?rev=786712&r1=786711&r2=786712&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/core/CHANGES.txt (original)
+++ hadoop/core/branches/HADOOP-4687/core/CHANGES.txt Fri Jun 19 23:12:41 2009
@@ -835,6 +835,12 @@
HADOOP-4041. IsolationRunner does not work as documented.
(Philip Zeyliger via tomwhite)
+ HADOOP-6004. Fixes BlockLocation deserialization. (Jakob Homan via
+ szetszwo)
+
+ HADOOP-6079. Serialize proxySource as DatanodeInfo in DataTransferProtocol.
+ (szetszwo)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
@@ -932,9 +938,6 @@
available memory on a tasktracker.
(Vinod Kumar Vavilapalli via yhemanth)
- HADOOP-5937. Correct a safemode message in FSNamesystem. (Ravi Phulari
- via szetszwo)
-
HADOOP-5908. Fixes a problem to do with ArithmeticException in the
JobTracker when there are jobs with 0 maps. (Amar Kamat via ddas)
@@ -953,6 +956,9 @@
HADOOP-5884. Fixes accounting in capacity scheduler so that high RAM jobs
take more slots. (Vinod Kumar Vavilapalli via yhemanth)
+ HADOOP-5937. Correct a safemode message in FSNamesystem. (Ravi Phulari
+ via szetszwo)
+
HADOOP-5869. Fix bug in assignment of setup / cleanup task that was
causing TestQueueCapacities to fail.
(Sreekanth Ramakrishnan via yhemanth)
Propchange: hadoop/core/branches/HADOOP-4687/core/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 19 23:12:41 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:776175-785643
+/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/core/branches/HADOOP-4687/core/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 19 23:12:41 2009
@@ -0,0 +1,2 @@
+/hadoop/core/branches/branch-0.19/core/src/docs:713112
+/hadoop/core/trunk/src/docs:785929-786278
Propchange: hadoop/core/branches/HADOOP-4687/core/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 19 23:12:41 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/core/src/java:713112
-/hadoop/core/trunk/src/core:776175-785643
+/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified:
hadoop/core/branches/HADOOP-4687/core/src/java/org/apache/hadoop/fs/BlockLocation.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/core/src/java/org/apache/hadoop/fs/BlockLocation.java?rev=786712&r1=786711&r2=786712&view=diff
==============================================================================
---
hadoop/core/branches/HADOOP-4687/core/src/java/org/apache/hadoop/fs/BlockLocation.java
(original)
+++
hadoop/core/branches/HADOOP-4687/core/src/java/org/apache/hadoop/fs/BlockLocation.java
Fri Jun 19 23:12:41 2009
@@ -17,9 +17,14 @@
*/
package org.apache.hadoop.fs;
-import org.apache.hadoop.io.*;
-
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableFactories;
+import org.apache.hadoop.io.WritableFactory;
/*
* A BlockLocation lists hosts, offset and length
@@ -213,15 +218,19 @@
name.readFields(in);
names[i] = name.toString();
}
+
int numHosts = in.readInt();
+ this.hosts = new String[numHosts];
for (int i = 0; i < numHosts; i++) {
Text host = new Text();
host.readFields(in);
hosts[i] = host.toString();
}
+
int numTops = in.readInt();
- Text path = new Text();
+ topologyPaths = new String[numTops];
for (int i = 0; i < numTops; i++) {
+ Text path = new Text();
path.readFields(in);
topologyPaths[i] = path.toString();
}
Propchange: hadoop/core/branches/HADOOP-4687/core/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 19 23:12:41 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
-/hadoop/core/trunk/src/test/core:776175-785643
+/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Propchange: hadoop/core/branches/HADOOP-4687/hdfs/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 19 23:12:41 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/hdfs/src/java:713112
-/hadoop/core/trunk/src/hdfs:776175-785643
+/hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
Modified:
hadoop/core/branches/HADOOP-4687/hdfs/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/hdfs/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java?rev=786712&r1=786711&r2=786712&view=diff
==============================================================================
---
hadoop/core/branches/HADOOP-4687/hdfs/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
(original)
+++
hadoop/core/branches/HADOOP-4687/hdfs/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Fri Jun 19 23:12:41 2009
@@ -372,7 +372,7 @@
out.writeLong(block.getBlock().getBlockId());
out.writeLong(block.getBlock().getGenerationStamp());
Text.writeString(out, source.getStorageID());
- proxySource.write(out);
+ proxySource.getDatanode().write(out);
AccessToken accessToken = AccessToken.DUMMY_TOKEN;
if (isAccessTokenEnabled) {
accessToken = accessTokenHandler.generateToken(null, block.getBlock()
@@ -496,7 +496,7 @@
}
/* A class that keeps track of a datanode in Balancer */
- private static class BalancerDatanode implements Writable {
+ private static class BalancerDatanode {
final private static long MAX_SIZE_TO_MOVE = 10*1024*1024*1024L; //10GB
protected DatanodeInfo datanode;
private double utilization;
@@ -584,17 +584,6 @@
PendingBlockMove pendingBlock) {
return pendingBlocks.remove(pendingBlock);
}
-
- /** The following two methods support the Writable interface */
- /** Deserialize */
- public void readFields(DataInput in) throws IOException {
- datanode.readFields(in);
- }
-
- /** Serialize */
- public void write(DataOutput out) throws IOException {
- datanode.write(out);
- }
}
/** A node that can be the sources of a block move */
