Repository: hama Updated Branches: refs/heads/master bf225235c -> e488e08d1
Modify Hama configuration variable from 'peer' to 'sync' Project: http://git-wip-us.apache.org/repos/asf/hama/repo Commit: http://git-wip-us.apache.org/repos/asf/hama/commit/ce572d8e Tree: http://git-wip-us.apache.org/repos/asf/hama/tree/ce572d8e Diff: http://git-wip-us.apache.org/repos/asf/hama/diff/ce572d8e Branch: refs/heads/master Commit: ce572d8eae22700b0a5e78f8bdba409e598e1e07 Parents: 0225205 Author: Minho Kim <[email protected]> Authored: Fri Nov 20 13:25:12 2015 +0900 Committer: Minho Kim <[email protected]> Committed: Mon Nov 23 09:01:27 2015 +0900 ---------------------------------------------------------------------- core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java | 2 +- .../main/java/org/apache/hama/bsp/sync/SyncServiceFactory.java | 4 ++-- core/src/test/java/org/apache/hama/bsp/TestBSPTaskFaults.java | 4 ++-- core/src/test/java/org/apache/hama/bsp/TestCheckpoint.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hama/blob/ce572d8e/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java b/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java index bcd8c58..122e2cb 100644 --- a/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java +++ b/core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java @@ -119,7 +119,7 @@ public class LocalBSPRunner implements JobSubmissionProtocol { conf.setClass(MessageManagerFactory.MESSAGE_MANAGER_CLASS, LocalMessageManager.class, MessageManager.class); - conf.setClass(SyncServiceFactory.SYNC_PEER_CLASS, LocalSyncClient.class, + conf.setClass(SyncServiceFactory.SYNC_CLIENT_CLASS, LocalSyncClient.class, SyncClient.class); BSPJob job = new BSPJob(new HamaConfiguration(conf), jobID); http://git-wip-us.apache.org/repos/asf/hama/blob/ce572d8e/core/src/main/java/org/apache/hama/bsp/sync/SyncServiceFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/hama/bsp/sync/SyncServiceFactory.java b/core/src/main/java/org/apache/hama/bsp/sync/SyncServiceFactory.java index 1324081..9767bed 100644 --- a/core/src/main/java/org/apache/hama/bsp/sync/SyncServiceFactory.java +++ b/core/src/main/java/org/apache/hama/bsp/sync/SyncServiceFactory.java @@ -22,7 +22,7 @@ import org.apache.hadoop.util.ReflectionUtils; public class SyncServiceFactory { public static final String SYNC_SERVER_CLASS = "hama.sync.server.class"; - public static final String SYNC_PEER_CLASS = "hama.sync.peer.class"; + public static final String SYNC_CLIENT_CLASS = "hama.sync.client.class"; public static final String SYNC_MASTER_CLASS = "hama.sync.master.class"; /** @@ -31,7 +31,7 @@ public class SyncServiceFactory { public static PeerSyncClient getPeerSyncClient(Configuration conf) throws ClassNotFoundException { return (PeerSyncClient) ReflectionUtils.newInstance(conf - .getClassByName(conf.get(SYNC_PEER_CLASS, + .getClassByName(conf.get(SYNC_CLIENT_CLASS, ZooKeeperSyncClientImpl.class.getName())), conf); } http://git-wip-us.apache.org/repos/asf/hama/blob/ce572d8e/core/src/test/java/org/apache/hama/bsp/TestBSPTaskFaults.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/hama/bsp/TestBSPTaskFaults.java b/core/src/test/java/org/apache/hama/bsp/TestBSPTaskFaults.java index d3cde10..9bf36f3 100644 --- a/core/src/test/java/org/apache/hama/bsp/TestBSPTaskFaults.java +++ b/core/src/test/java/org/apache/hama/bsp/TestBSPTaskFaults.java @@ -316,7 +316,7 @@ public class TestBSPTaskFaults extends TestCase { HamaConfiguration hamaConf = new HamaConfiguration(); hamaConf.setInt(Constants.GROOM_PING_PERIOD, 200); hamaConf.setClass("bsp.work.class", FaulTestBSP.class, BSP.class); - hamaConf.setClass(SyncServiceFactory.SYNC_PEER_CLASS, + hamaConf.setClass(SyncServiceFactory.SYNC_CLIENT_CLASS, LocalBSPRunner.LocalSyncClient.class, SyncClient.class); hamaConf.setInt("bsp.master.port", 610002); @@ -420,7 +420,7 @@ public class TestBSPTaskFaults extends TestCase { conf.setInt(Constants.GROOM_PING_PERIOD, 200); conf.setClass("bsp.work.class", FaulTestBSP.class, BSP.class); - conf.setClass(SyncServiceFactory.SYNC_PEER_CLASS, + conf.setClass(SyncServiceFactory.SYNC_CLIENT_CLASS, LocalBSPRunner.LocalSyncClient.class, SyncClient.class); int port = BSPNetUtils.getFreePort(4321 + incrementTestNumber()); http://git-wip-us.apache.org/repos/asf/hama/blob/ce572d8e/core/src/test/java/org/apache/hama/bsp/TestCheckpoint.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/hama/bsp/TestCheckpoint.java b/core/src/test/java/org/apache/hama/bsp/TestCheckpoint.java index d31bfe2..04d0e59 100644 --- a/core/src/test/java/org/apache/hama/bsp/TestCheckpoint.java +++ b/core/src/test/java/org/apache/hama/bsp/TestCheckpoint.java @@ -476,7 +476,7 @@ public class TestCheckpoint extends TestCase { public void testCheckpointInterval() throws Exception { Configuration config = new Configuration(); System.setProperty("user.dir", "/tmp"); - config.set(SyncServiceFactory.SYNC_PEER_CLASS, + config.set(SyncServiceFactory.SYNC_CLIENT_CLASS, TempSyncClient.class.getName()); config.set(Constants.FAULT_TOLERANCE_CLASS, AsyncRcvdMsgCheckpointImpl.class.getName()); @@ -552,7 +552,7 @@ public class TestCheckpoint extends TestCase { @SuppressWarnings("rawtypes") public void testCheckpoint() throws Exception { Configuration config = new Configuration(); - config.set(SyncServiceFactory.SYNC_PEER_CLASS, + config.set(SyncServiceFactory.SYNC_CLIENT_CLASS, TempSyncClient.class.getName()); config.setBoolean(Constants.FAULT_TOLERANCE_FLAG, true); config.set(Constants.FAULT_TOLERANCE_CLASS, @@ -613,7 +613,7 @@ public class TestCheckpoint extends TestCase { public void testPeerRecovery() throws Exception { Configuration config = new Configuration(); - config.set(SyncServiceFactory.SYNC_PEER_CLASS, + config.set(SyncServiceFactory.SYNC_CLIENT_CLASS, TempSyncClient.class.getName()); config.set(Constants.FAULT_TOLERANCE_CLASS, AsyncRcvdMsgCheckpointImpl.class.getName());
