Author: cos
Date: Tue Dec 8 23:54:28 2009
New Revision: 888638
URL: http://svn.apache.org/viewvc?rev=888638&view=rev
Log:
HADOOP-6386. svn merge -c 888565 from trunk to branch-0.21 (cos)
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 Tue Dec 8 23:54:28 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:818543,819670,824900-824942,831032,831070,832157,884428,885534
+/hadoop/common/trunk:818543,819670,824900-824942,831032,831070,832157,884428,885534,888565
/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=888638&r1=888637&r2=888638&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Tue Dec 8 23:54:28 2009
@@ -1129,6 +1129,9 @@
HADOOP-6375. Sync documentation for FsShell du with its implementation.
(Todd Lipcon via cdouglas)
+ HADOOP-6386. NameNode's HttpServer can't instantiate InetSocketAddress:
+ IllegalArgumentException is thrown (cos)
+
Release 0.20.2 - Unreleased
NEW FEATURES
Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 8 23:54:28 2009
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:818543,819670,823756,824900-824942,831032,831070,832157,884428
+/hadoop/common/trunk/CHANGES.txt:818543,819670,823756,824900-824942,831032,831070,832157,884428,888565
/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 Tue Dec 8 23:54:28 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:818543,819670,831032,831070,832157,884428,885534
+/hadoop/common/trunk/src/contrib/ec2:818543,819670,831032,831070,832157,884428,885534,888565
/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 Tue Dec 8 23:54:28 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:818543,819670,831032,831070,832157,884428,885534
+/hadoop/common/trunk/src/docs:818543,819670,831032,831070,832157,884428,885534,888565
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 8 23:54:28 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:818543,819670,831032,831070,832157,884428,885534
+/hadoop/common/trunk/src/java:818543,819670,831032,831070,832157,884428,885534,888565
/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=888638&r1=888637&r2=888638&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
Tue Dec 8 23:54:28 2009
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -469,6 +470,33 @@
} //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");
+ Random r = new Random(1000);
+ 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(r.nextInt());
+
+ 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 Tue Dec 8 23:54:28 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:818543,819670,831032,831070,832157,884428,885534
+/hadoop/common/trunk/src/test/core:818543,819670,831032,831070,832157,884428,885534,888565
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
