You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2015/04/21 11:50:49 UTC
svn commit: r1675076 - in /hama/trunk/core/src/main/java/org/apache/hama: BSPMasterRunner.java GroomServerRunner.java ZooKeeperRunner.java

Author: edwardyoon
Date: Tue Apr 21 09:50:48 2015
New Revision: 1675076

URL: http://svn.apache.org/r1675076
Log:
HAMA-952: when daemons are starting, hama should use its settings.

Modified:
    hama/trunk/core/src/main/java/org/apache/hama/BSPMasterRunner.java
    hama/trunk/core/src/main/java/org/apache/hama/GroomServerRunner.java
    hama/trunk/core/src/main/java/org/apache/hama/ZooKeeperRunner.java

Modified: hama/trunk/core/src/main/java/org/apache/hama/BSPMasterRunner.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/BSPMasterRunner.java?rev=1675076&r1=1675075&r2=1675076&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/BSPMasterRunner.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/BSPMasterRunner.java Tue Apr 21 09:50:48 2015
@@ -42,7 +42,7 @@ public class BSPMasterRunner extends Con
     }
 
     try {
-      HamaConfiguration conf = new HamaConfiguration(getConf());
+      HamaConfiguration conf = new HamaConfiguration();
       BSPMaster master = BSPMaster.startMaster(conf);
       master.offerService();
     } catch (Throwable e) {

Modified: hama/trunk/core/src/main/java/org/apache/hama/GroomServerRunner.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/GroomServerRunner.java?rev=1675076&r1=1675075&r2=1675076&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/GroomServerRunner.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/GroomServerRunner.java Tue Apr 21 09:50:48 2015
@@ -19,7 +19,6 @@ package org.apache.hama;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Tool;
@@ -38,7 +37,7 @@ public class GroomServerRunner extends C
     StringUtils.startupShutdownMessage(GroomServer.class, args, LOG);
 
     try {
-      Configuration conf = new HamaConfiguration(getConf());
+      HamaConfiguration conf = new HamaConfiguration();
 
       if (args.length == 1) {
         conf.set("bsp.peer.hostname", args[0]);

Modified: hama/trunk/core/src/main/java/org/apache/hama/ZooKeeperRunner.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/ZooKeeperRunner.java?rev=1675076&r1=1675075&r2=1675076&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/ZooKeeperRunner.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/ZooKeeperRunner.java Tue Apr 21 09:50:48 2015
@@ -33,7 +33,7 @@ public class ZooKeeperRunner extends Con
 
   @Override
   public int run(String[] args) throws Exception {
-    QuorumPeer.run(getConf());
+    QuorumPeer.run(new HamaConfiguration());
     return 0;
   }