svn commit: r1670882 - in /hama/trunk: CHANGES.txt yarn/src/main/java/org/apache/hama/bsp/BSPApplicationMaster.java

[edwardyoon]

Author: edwardyoon
Date: Thu Apr  2 10:34:08 2015
New Revision: 1670882

URL: http://svn.apache.org/r1670882
Log:
HAMA-935: Doesn't operate if hostname doesn't match between AppMaster and 
Zookeeper quorum

Modified:
    hama/trunk/CHANGES.txt
    hama/trunk/yarn/src/main/java/org/apache/hama/bsp/BSPApplicationMaster.java

Modified: hama/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1670882&r1=1670881&r2=1670882&view=diff
==============================================================================
--- hama/trunk/CHANGES.txt (original)
+++ hama/trunk/CHANGES.txt Thu Apr  2 10:34:08 2015
@@ -12,6 +12,7 @@ Release 0.7.0 (unreleased changes)
 
   BUG FIXES
 
+   HAMA-935: Doesn't operate if hostname doesn't match between AppMaster and 
Zookeeper quorum (Minho Kim via edwardyoon)
    HAMA-931: Make the HAMA base path configurable (Minho Kim via edwardyoon)
    HAMA-930: Add hama-yarn to binary distribution (Minho Kim via edwardyoon)  
    HAMA-848: Refactor YARN module for hadoop 2.x stable version (Minho Kim via 
edwardyoon)

Modified: 
hama/trunk/yarn/src/main/java/org/apache/hama/bsp/BSPApplicationMaster.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/yarn/src/main/java/org/apache/hama/bsp/BSPApplicationMaster.java?rev=1670882&r1=1670881&r2=1670882&view=diff
==============================================================================
--- hama/trunk/yarn/src/main/java/org/apache/hama/bsp/BSPApplicationMaster.java 
(original)
+++ hama/trunk/yarn/src/main/java/org/apache/hama/bsp/BSPApplicationMaster.java 
Thu Apr  2 10:34:08 2015
@@ -57,6 +57,7 @@ import org.apache.hadoop.yarn.util.Clock
 import org.apache.hadoop.yarn.util.ConverterUtils;
 import org.apache.hadoop.yarn.util.Records;
 import org.apache.hadoop.yarn.util.SystemClock;
+import org.apache.hama.Constants;
 import org.apache.hama.HamaConfiguration;
 import org.apache.hama.bsp.Job.JobState;
 import org.apache.hama.bsp.sync.SyncServer;
@@ -139,6 +140,9 @@ public class BSPApplicationMaster implem
     this.hostname = BSPNetUtils.getCanonicalHostname();
     this.clientPort = BSPNetUtils.getFreePort(12000);
 
+    // Set configuration for starting SyncServer which run Zookeeper
+    this.jobConf.set(Constants.ZOOKEEPER_QUORUM, hostname);
+
     // start our synchronization service
     startSyncServer();