You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2011/05/03 01:11:04 UTC
svn commit: r1098847 - in /hadoop/common/branches/branch-0.20-security-204:
./ src/c++/pipes/impl/ src/c++/utils/impl/ src/hdfs/org/apache/hadoop/hdfs/
src/mapred/
Author: suresh
Date: Mon May 2 23:11:03 2011
New Revision: 1098847
URL: http://svn.apache.org/viewvc?rev=1098847&view=rev
Log:
Merging change r1098837 from branch-0.20-security
Modified:
hadoop/common/branches/branch-0.20-security-204/ (props changed)
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/build.xml
hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/impl/HadoopPipes.cc
hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/SerialUtils.cc
hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/StringUtils.cc
hadoop/common/branches/branch-0.20-security-204/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
hadoop/common/branches/branch-0.20-security-204/src/mapred/ (props changed)
Propchange: hadoop/common/branches/branch-0.20-security-204/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 2 23:11:03 2011
@@ -1,4 +1,5 @@
-/hadoop/common/branches/branch-0.20:960946
+/hadoop/common/branches/branch-0.20:829987,831184,909245,909723,960946
+/hadoop/common/branches/branch-0.20-security:1098837
/hadoop/common/branches/branch-0.20-security-203:1096071
/hadoop/core/branches/branch-0.19:713112
/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1098847&r1=1098846&r2=1098847&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Mon May 2 23:11:03 2011
@@ -1730,6 +1730,11 @@ Release 0.20.2 - Unreleased
before it constructs and sends its own ack message for the packet.
(hairong)
+ HDFS-723. Fix deadlock in DFSClient#DFSOutputStream. (hairong)
+
+ HDFS-732. DFSClient.DFSOutputStream.close() should throw an exception if
+ the stream cannot be closed successfully. (szetszwo)
+
IMPROVEMENTS
HDFS-187. Initialize secondary namenode http address in TestStartup.
@@ -1738,6 +1743,27 @@ Release 0.20.2 - Unreleased
HDFS-185. Disallow chown, chgrp, chmod, setQuota, and setSpaceQuota when
name-node is in safemode. (Ravi Phulari via shv)
+ HADOOP-5611. Fix C++ libraries to build on Debian Lenny. (Todd Lipcon
+ via tomwhite)
+
+ HADOOP-5612. Some c++ scripts are not chmodded before ant execution.
+ (Todd Lipcon via tomwhite)
+
+ HDFS-579. Fix DfsTask to follow the semantics of 0.19, regarding non-zero
+ return values as failures. (Christian Kunz via cdouglas)
+
+ HDFS-596. Fix memory leak in hdfsFreeFileInfo() for libhdfs.
+ (Zhang Bingjun via dhruba)
+
+ MAPREDUCE-1070. Prevent a deadlock in the fair scheduler servlet.
+ (Todd Lipcon via cdouglas)
+
+ HADOOP-5623. Ensure streaming status messages aren't overwritten. (Rick
+ Cox & Ravi Gummadi via tomwhite)
+
+ MAPREDUCE-1163. Remove unused, hard-coded paths from libhdfs. (Allen
+ Wittenauer via cdouglas)
+
Release 0.20.1 - 2009-09-01
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 2 23:11:03 2011
@@ -1,4 +1,5 @@
-/hadoop/common/branches/branch-0.20/CHANGES.txt:960946
+/hadoop/common/branches/branch-0.20/CHANGES.txt:829987,831184,909245,909723,960946
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1098837
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
Modified: hadoop/common/branches/branch-0.20-security-204/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/build.xml?rev=1098847&r1=1098846&r2=1098847&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-204/build.xml Mon May 2 23:11:03 2011
@@ -1768,6 +1768,7 @@
<target name="create-c++-utils-makefile" depends="check-c++-makefiles"
if="need.c++.utils.makefile">
<mkdir dir="${build.c++.utils}"/>
+ <chmod file="${c++.utils.src}/configure" perm="ugo+x"/>
<exec executable="${c++.utils.src}/configure" dir="${build.c++.utils}"
failonerror="yes">
<arg value="--prefix=${install.c++}"/>
@@ -1785,6 +1786,7 @@
<target name="create-c++-pipes-makefile" depends="check-c++-makefiles"
if="need.c++.pipes.makefile">
<mkdir dir="${build.c++.pipes}"/>
+ <chmod file="${c++.pipes.src}/configure" perm="ugo+x"/>
<exec executable="${c++.pipes.src}/configure" dir="${build.c++.pipes}"
failonerror="yes">
<arg value="--prefix=${install.c++}"/>
@@ -1807,6 +1809,7 @@
depends="check-c++-makefiles"
if="need.c++.examples.pipes.makefile">
<mkdir dir="${build.c++.examples.pipes}"/>
+ <chmod file="${c++.examples.pipes.src}/configure" perm="ugo+x"/>
<exec executable="${c++.examples.pipes.src}/configure"
dir="${build.c++.examples.pipes}"
failonerror="yes">
Modified: hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/impl/HadoopPipes.cc
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/c%2B%2B/pipes/impl/HadoopPipes.cc?rev=1098847&r1=1098846&r2=1098847&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/impl/HadoopPipes.cc (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/impl/HadoopPipes.cc Mon May 2 23:11:03 2011
@@ -28,6 +28,7 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <strings.h>
#include <sys/socket.h>
#include <pthread.h>
Modified: hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/SerialUtils.cc
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/c%2B%2B/utils/impl/SerialUtils.cc?rev=1098847&r1=1098846&r2=1098847&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/SerialUtils.cc (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/SerialUtils.cc Mon May 2 23:11:03 2011
@@ -22,6 +22,7 @@
#include <rpc/types.h>
#include <rpc/xdr.h>
#include <string>
+#include <string.h>
using std::string;
Modified: hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/StringUtils.cc
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/c%2B%2B/utils/impl/StringUtils.cc?rev=1098847&r1=1098846&r2=1098847&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/StringUtils.cc (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/c++/utils/impl/StringUtils.cc Mon May 2 23:11:03 2011
@@ -21,6 +21,8 @@
#include <errno.h>
#include <stdint.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <strings.h>
#include <sys/time.h>
Modified: hadoop/common/branches/branch-0.20-security-204/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1098847&r1=1098846&r2=1098847&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Mon May 2 23:11:03 2011
@@ -1107,10 +1107,17 @@ public class DFSClient implements FSCons
}
}
- synchronized void close() {
- while (!pendingCreates.isEmpty()) {
- String src = pendingCreates.firstKey();
- OutputStream out = pendingCreates.remove(src);
+ void close() {
+ while (true) {
+ String src;
+ OutputStream out;
+ synchronized (this) {
+ if (pendingCreates.isEmpty()) {
+ return;
+ }
+ src = pendingCreates.firstKey();
+ out = pendingCreates.remove(src);
+ }
if (out != null) {
try {
out.close();
@@ -3338,8 +3345,13 @@ public class DFSClient implements FSCons
*/
@Override
public void close() throws IOException {
- if(closed)
- return;
+ if (closed) {
+ IOException e = lastException;
+ if (e == null)
+ return;
+ else
+ throw e;
+ }
closeInternal();
leasechecker.remove(src);
Propchange: hadoop/common/branches/branch-0.20-security-204/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 2 23:11:03 2011
@@ -1,4 +1,5 @@
-/hadoop/common/branches/branch-0.20/src/mapred:960946
+/hadoop/common/branches/branch-0.20/src/mapred:829987,831184,909245,909723,960946
+/hadoop/common/branches/branch-0.20-security/src/mapred:1098837
/hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071
/hadoop/core/branches/branch-0.19/src/mapred:713112
/hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569