HADOOP-3628 merge revision r752949 into its proper home

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628@755965 13f79535-47bb-0310-9956-ffa450edef68

Author: steveloughran

ivy/libraries.properties

@@ -35,7 +35,7 @@ coreplugin.version=1.3.2
 hsqldb.version=1.8.0.10
 
 #ivy.version=2.0.0-beta2
-ivy.version=2.0.0-rc2
+ivy.version=2.0.0
 
 jasper.version=5.5.12
 #not able to figureout the version of jsp & jsp-api version to get it resolved throught ivy

src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java

@@ -71,7 +71,7 @@ String[] genArgs(String memLimit) {
    * it to succeed. Then program is launched with insufficient memory and 
    * is expected to be a failure.  
    */
-  public void testCommandLine() {
+  public void testCommandLine() throws Exception {
     if (StreamUtil.isCygwin()) {
       return;
     }
@@ -88,11 +88,9 @@ public void testCommandLine() {
       fs.delete(outputPath, true);
       assertFalse("output not cleaned up", fs.exists(outputPath));
       mr.waitUntilIdle();
-    } catch(IOException e) {
-      fail(e.toString());
     } finally {
-      mr.shutdown();
-      dfs.shutdown();
+      MiniDFSCluster.close(dfs);
+      MiniMRCluster.close(mr);
     }
   }
 

src/core/org/apache/hadoop/conf/Configuration.java

@@ -185,6 +185,9 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
   private Properties properties;
   private Properties overlay;
   private ClassLoader classLoader;
+  private static final String ERROR_PARSING_CONF_FILE = 
+          "Error parsing configuration resource ";
+
   {
     classLoader = Thread.currentThread().getContextClassLoader();
     if (classLoader == null) {
@@ -973,7 +976,7 @@ public Reader getConfResourceAsReader(String name) {
     }
   }
 
-  private synchronized Properties getProps() {
+  protected synchronized Properties getProps() {
     if (properties == null) {
       properties = new Properties();
       loadResources(properties, resources, quietmode);
@@ -1157,16 +1160,16 @@ private void loadResource(Properties properties, Object name, boolean quiet) {
       }
 
     } catch (IOException e) {
-      LOG.fatal("error parsing conf file: " + e);
+      LOG.fatal(ERROR_PARSING_CONF_FILE + name + " : " + e, e);
       throw new RuntimeException(e);
     } catch (DOMException e) {
-      LOG.fatal("error parsing conf file: " + e);
+      LOG.fatal(ERROR_PARSING_CONF_FILE + name + " : " + e, e);
       throw new RuntimeException(e);
     } catch (SAXException e) {
-      LOG.fatal("error parsing conf file: " + e);
+      LOG.fatal(ERROR_PARSING_CONF_FILE + name + " : " + e, e);
       throw new RuntimeException(e);
     } catch (ParserConfigurationException e) {
-      LOG.fatal("error parsing conf file: " + e);
+      LOG.fatal(ERROR_PARSING_CONF_FILE + name + " : " + e, e);
       throw new RuntimeException(e);
     }
   }

src/core/org/apache/hadoop/http/HttpServer.java

@@ -22,6 +22,7 @@
 import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.net.URL;
+import java.net.BindException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -457,7 +458,11 @@ public void start() throws IOException {
           // then try the next port number.
           if (ex instanceof BindException) {
             if (!findPort) {
-              throw (BindException) ex;
+              BindException be = new BindException(
+                      "Port in use: " + listener.getHost()
+                              + ":" + listener.getPort());
+              be.initCause(ex);
+              throw be;
             }
           } else {
             LOG.info("HttpServer.start() threw a non Bind IOException"); 
@@ -488,6 +493,14 @@ public void join() throws InterruptedException {
     webServer.join();
   }
 
+  /**
+   * Test for the availability of the web server
+   * @return true if the web server is started, false otherwise
+   */
+  public boolean isAlive() {
+    return webServer.isStarted();
+  }
+
   /**
    * A very simple servlet to serve up a text representation of the current
    * stack traces. It both returns the stacks to the caller and logs them.

src/core/org/apache/hadoop/ipc/Client.java

@@ -284,8 +284,9 @@ public int read(byte[] buf, int off, int len) throws IOException {
     /** Connect to the server and set up the I/O streams. It then sends
      * a header to the server and starts
      * the connection thread that waits for responses.
+     * @throws IOException if the connection attempt was unsuccessful
      */
-    private synchronized void setupIOstreams() {
+    private synchronized void setupIOstreams() throws IOException {
       if (socket != null || shouldCloseConnection.get()) {
         return;
       }
@@ -308,7 +309,7 @@ private synchronized void setupIOstreams() {
             /* The max number of retries is 45,
              * which amounts to 20s*45 = 15 minutes retries.
              */
-            handleConnectionFailure(timeoutFailures++, 45, toe);
+            handleConnectionFailure(timeoutFailures++, maxRetries, toe);
           } catch (IOException ie) {
             handleConnectionFailure(ioFailures++, maxRetries, ie);
           }
@@ -327,6 +328,7 @@ private synchronized void setupIOstreams() {
       } catch (IOException e) {
         markClosed(e);
         close();
+        throw e;
       }
     }
 
@@ -358,7 +360,7 @@ private void handleConnectionFailure(
 
       // throw the exception if the maximum number of retries is reached
       if (curRetries >= maxRetries) {
-        throw ioe;
+        throw wrapException(remoteId.getAddress(), ioe);
       }
 
       // otherwise back off and retry
@@ -367,7 +369,7 @@ private void handleConnectionFailure(
       } catch (InterruptedException ignored) {}
 
       LOG.info("Retrying connect to server: " + server + 
-          ". Already tried " + curRetries + " time(s).");
+          ". Already tried " + curRetries + " time(s) out of "+ maxRetries);
     }
 
     /* Write the header for each connection

src/core/org/apache/hadoop/ipc/RPC.java

@@ -301,7 +301,7 @@ public static VersionedProtocol waitForProxy(Class protocol,
    * @return the proxy
    * @throws IOException if the far end through a RemoteException
    */
-  static VersionedProtocol waitForProxy(Class protocol,
+  public static VersionedProtocol waitForProxy(Class protocol,
                                                long clientVersion,
                                                InetSocketAddress addr,
                                                Configuration conf,