Author: cos
Date: Sat May 22 00:31:56 2010
New Revision: 947219
URL: http://svn.apache.org/viewvc?rev=947219&view=rev
Log:
HADOOP-6760. svn merge -c 947218 from trunk
Modified:
hadoop/common/branches/branch-0.21/ (props changed)
hadoop/common/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.21/src/contrib/ec2/ (props changed)
hadoop/common/branches/branch-0.21/src/docs/ (props changed)
hadoop/common/branches/branch-0.21/src/java/ (props changed)
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
hadoop/common/branches/branch-0.21/src/test/core/ (props changed)
Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:31:56 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:944521,945941-945953
+/hadoop/common/trunk:944521,945941-945953,947218
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=947219&r1=947218&r2=947219&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Sat May 22 00:31:56 2010
@@ -891,6 +891,9 @@ Release 0.21.0 - Unreleased
(Dmytro Molkov via hairong)
BUG FIXES
+
+ HADOOP-6760. WebServer shouldn't increase port number in case of negative
+ port setting caused by Jetty's race (cos)
HADOOP-5379. CBZip2InputStream to throw IOException on data crc error.
(Rodrigo Schmidt via zshao)
Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:31:56 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:944521,945941-945953
+/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218
/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,785929-786278
Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:31:56 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953
+/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218
/hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
/hadoop/core/trunk/src/contrib/ec2:776175-784663
Propchange: hadoop/common/branches/branch-0.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:31:56 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:944521,945941-945953
+/hadoop/common/trunk/src/docs:944521,945941-945953,947218
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:31:56 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:944521,945941-945953
+/hadoop/common/trunk/src/java:944521,945941-945953,947218
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java?rev=947219&r1=947218&r2=947219&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
(original)
+++
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
Sat May 22 00:31:56 2010
@@ -495,32 +495,6 @@ public class HttpServer implements Filte
} //Workaround end
LOG.info("Jetty bound to port " + port);
webServer.start();
- // Workaround for HADOOP-6386
- port = listener.getLocalPort();
- if (port < 0) {
- LOG.warn("Bounds port is " + port + " after webserver start");
- for (int i = 0; i < MAX_RETRIES/2; i++) {
- try {
- webServer.stop();
- } catch (Exception e) {
- LOG.warn("Can't stop web-server", e);
- }
- Thread.sleep(1000);
-
- listener.setPort(oriPort == 0 ? 0 : (oriPort += 1));
- listener.open();
- Thread.sleep(100);
- webServer.start();
- LOG.info(i + "attempts to restart webserver");
- port = listener.getLocalPort();
- if (port > 0)
- break;
- }
- if (port < 0)
- throw new Exception("listener.getLocalPort() is returning " +
- "less than 0 even after " +MAX_RETRIES+"
resets");
- }
- // End of HADOOP-6386 workaround
break;
} catch (IOException ex) {
// if this is a bind exception,
Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:31:56 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:944521,945941-945953
+/hadoop/common/trunk/src/test/core:944521,945941-945953,947218
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
