Repository: incubator-ratis Updated Branches: refs/heads/master bcb806d1c -> 3dcda9c1c
RATIS-25. Fix Hadoop Rpc test javac error. Contributed by Tsz Wo Nicholas Sze. Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/3dcda9c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/3dcda9c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/3dcda9c1 Branch: refs/heads/master Commit: 3dcda9c1c8409845f324416c1fac6d4628bdff40 Parents: bcb806d Author: Jing Zhao <[email protected]> Authored: Tue Feb 21 14:17:23 2017 -0800 Committer: Jing Zhao <[email protected]> Committed: Tue Feb 21 14:17:23 2017 -0800 ---------------------------------------------------------------------- .../hadooprpc/TestNotLeaderExceptionWithHadoopRpc.java | 9 ++------- .../hadooprpc/TestRaftReconfigurationWithHadoopRpc.java | 4 ++-- .../apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java | 11 ++++------- 3 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3dcda9c1/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestNotLeaderExceptionWithHadoopRpc.java ---------------------------------------------------------------------- diff --git a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestNotLeaderExceptionWithHadoopRpc.java b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestNotLeaderExceptionWithHadoopRpc.java index 8bc5ae6..315d194 100644 --- a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestNotLeaderExceptionWithHadoopRpc.java +++ b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestNotLeaderExceptionWithHadoopRpc.java @@ -17,21 +17,16 @@ */ package org.apache.ratis.hadooprpc; -import org.apache.hadoop.conf.Configuration; import org.apache.ratis.MiniRaftCluster; import org.apache.ratis.RaftNotLeaderExceptionBaseTest; import org.apache.ratis.conf.RaftProperties; -import org.apache.ratis.server.RaftServerConfigKeys; import java.io.IOException; public class TestNotLeaderExceptionWithHadoopRpc extends RaftNotLeaderExceptionBaseTest { @Override public MiniRaftCluster initCluster() throws IOException { - String[] s = MiniRaftCluster.generateIds(NUM_PEERS, 0); - final Configuration conf = new Configuration(); - conf.set(RaftServerConfigKeys.Ipc.ADDRESS_KEY, "0.0.0.0:0"); - RaftProperties prop = new RaftProperties(); - return new MiniRaftClusterWithHadoopRpc(s, prop, conf, true); + return MiniRaftClusterWithHadoopRpc.FACTORY.newCluster( + NUM_PEERS, new RaftProperties(), true); } } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3dcda9c1/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java ---------------------------------------------------------------------- diff --git a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java index cd502ac..c6b5226 100644 --- a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java +++ b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java @@ -19,7 +19,7 @@ package org.apache.ratis.hadooprpc; import org.apache.hadoop.conf.Configuration; import org.apache.ratis.MiniRaftCluster; -import org.apache.ratis.server.RaftServerConfigKeys; +import org.apache.ratis.hadooprpc.server.HadoopRpcServerConfigKeys; import org.apache.ratis.server.impl.RaftReconfigurationBaseTest; import java.io.IOException; @@ -34,7 +34,7 @@ public class TestRaftReconfigurationWithHadoopRpc final Configuration hadoopConf = new Configuration(); hadoopConf.setInt(IPC_CLIENT_CONNECT_TIMEOUT_KEY, 1000); hadoopConf.setInt(IPC_CLIENT_CONNECT_MAX_RETRIES_KEY, 0); - hadoopConf.set(RaftServerConfigKeys.Ipc.ADDRESS_KEY, "0.0.0.0:0"); + HadoopRpcServerConfigKeys.Ipc.setAddress(hadoopConf::set, "0.0.0.0:0"); return new MiniRaftClusterWithHadoopRpc(peerNum, prop, hadoopConf); } } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3dcda9c1/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java ---------------------------------------------------------------------- diff --git a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java index 9dd3f27..44cb672 100644 --- a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java +++ b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java @@ -17,20 +17,18 @@ */ package org.apache.ratis.hadooprpc; -import org.apache.hadoop.conf.Configuration; import org.apache.log4j.Level; import org.apache.ratis.RaftBasicTests; import org.apache.ratis.client.RaftClient; -import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.BlockRequestHandlingInjection; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.util.RaftUtils; import org.junit.Test; -import static org.apache.ratis.hadooprpc.MiniRaftClusterWithHadoopRpc.sendServerRequest; - import java.io.IOException; +import static org.apache.ratis.hadooprpc.MiniRaftClusterWithHadoopRpc.sendServerRequest; + public class TestRaftWithHadoopRpc extends RaftBasicTests { static { RaftUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG); @@ -41,9 +39,8 @@ public class TestRaftWithHadoopRpc extends RaftBasicTests { private final MiniRaftClusterWithHadoopRpc cluster; public TestRaftWithHadoopRpc() throws IOException { - Configuration conf = new Configuration(); - conf.set(RaftServerConfigKeys.Ipc.ADDRESS_KEY, "0.0.0.0:0"); - cluster = new MiniRaftClusterWithHadoopRpc(NUM_SERVERS, getProperties(), conf); + cluster = MiniRaftClusterWithHadoopRpc.FACTORY.newCluster( + NUM_SERVERS, getProperties(), true); } @Override
