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.
@@ -128,7 +127,7 @@
- zookeeper.client.port
+ hama.zookeeper.property.clientPort
21810
Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
Index: src/java/org/apache/hama/Constants.java
===================================================================
--- src/java/org/apache/hama/Constants.java (revision 1134165)
+++ src/java/org/apache/hama/Constants.java (working copy)
@@ -76,7 +76,7 @@
public static final int DEFAULT_ZOOKEEPER_PAUSE = 2 * 1000;
static final String ZOOKEEPER_CONFIG_NAME = "zoo.cfg";
- static final String ZOOKEPER_CLIENT_PORT = "zookeeper.client.port";
+ static final String ZOOKEPER_CLIENT_PORT = "hama.zookeeper.property.clientPort";
static final int DEFAULT_ZOOKEPER_CLIENT_PORT = 21810;
static final String ZOOKEEPER_QUORUM = "hama.zookeeper.quorum";
/** Cluster is in distributed mode or not */
Index: src/java/org/apache/hama/zookeeper/QuorumPeer.java
===================================================================
--- src/java/org/apache/hama/zookeeper/QuorumPeer.java (revision 1134165)
+++ src/java/org/apache/hama/zookeeper/QuorumPeer.java (working copy)
@@ -55,8 +55,6 @@
private static final String ZK_CFG_PROPERTY = "hama.zookeeper.property.";
private static final int ZK_CFG_PROPERTY_SIZE = ZK_CFG_PROPERTY.length();
- private static final String ZK_CLIENT_PORT_KEY = ZK_CFG_PROPERTY
- + "clientPort";
/**
* Parse ZooKeeper configuration from Hama XML config and run a QuorumPeer.
@@ -197,8 +195,8 @@
}
// If clientPort is not set, assign the default
- if (zkProperties.getProperty(ZK_CLIENT_PORT_KEY) == null) {
- zkProperties.put(ZK_CLIENT_PORT_KEY, DEFAULT_ZOOKEPER_CLIENT_PORT);
+ if (zkProperties.getProperty(ZOOKEPER_CLIENT_PORT) == null) {
+ zkProperties.put(ZOOKEPER_CLIENT_PORT, DEFAULT_ZOOKEPER_CLIENT_PORT);
}
// Create the server.X properties.