Index: conf/hama-default.xml =================================================================== --- conf/hama-default.xml (revision 1134165) +++ conf/hama-default.xml (working copy) @@ -57,13 +57,13 @@ - bsp.groom.report.address - 127.0.0.1:0 - The interface and port that groom server listens on. - Since it is only connected to by the tasks, it uses the local interface. - EXPERT ONLY. Should only be changed if your host does not have the loopback - interface. - + bsp.groom.report.address + 127.0.0.1:0 + The interface and port that groom server listens on. + Since it is only connected to by the tasks, it uses the local interface. + EXPERT ONLY. Should only be changed if your host does not have the loopback + interface. + bsp.system.dir ${hadoop.tmp.dir}/bsp/system @@ -84,7 +84,6 @@ For example, to enable verbose gc logging to a file named for the taskid in /tmp and to set the heap maximum to be a gigabyte, pass a 'value' of: -Xmx1024m -verbose:gc -Xloggc:/tmp/@taskid@.gc - The configuration variable bsp.child.ulimit can be used to control the maximum virtual memory of the child processes. Index: src/java/org/apache/hama/http/HttpServer.java =================================================================== --- src/java/org/apache/hama/http/HttpServer.java (revision 1134165) +++ src/java/org/apache/hama/http/HttpServer.java (working copy) @@ -62,7 +62,7 @@ public class HttpServer { public static final Log LOG = LogFactory.getLog(HttpServer.class); - static final String FILTER_INITIALIZER_PROPERTY = "hadoop.http.filter.initializers"; + static final String FILTER_INITIALIZER_PROPERTY = "hama.http.filter.initializers"; protected final Server webServer; protected final Connector listener; @@ -140,8 +140,8 @@ */ protected void addDefaultApps(ContextHandlerCollection parent, final String appDir) throws IOException { - // set up the context for "/logs/" if "hadoop.log.dir" property is defined. - String logDir = System.getProperty("hadoop.log.dir"); + // set up the context for "/logs/" if "hama.log.dir" property is defined. + String logDir = System.getProperty("hama.log.dir"); if (logDir != null) { Context logContext = new Context(parent, "/logs"); logContext.setResourceBase(logDir); @@ -384,7 +384,7 @@ + listener.getLocalPort() + " webServer.getConnectors()[0].getLocalPort() returned " + webServer.getConnectors()[0].getLocalPort()); - // Workaround to handle the problem reported in HADOOP-4744 + if (port < 0) { Thread.sleep(100); int numRetries = 1; @@ -416,7 +416,6 @@ } // 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"); @@ -441,7 +440,6 @@ 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,