Repository: hbase Updated Branches: refs/heads/branch-1.1 e3c96b100 -> e9e9cce81
HBASE-13499 AsyncRpcClient test cases failure in powerpc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e9e9cce8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e9e9cce8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e9e9cce8 Branch: refs/heads/branch-1.1 Commit: e9e9cce81faf9189b3f6485b330e746502986557 Parents: e3c96b1 Author: zhangduo <zhang...@wandoujia.com> Authored: Tue Apr 14 22:04:14 2015 +0800 Committer: zhangduo <zhang...@wandoujia.com> Committed: Tue Apr 14 23:00:26 2015 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/JVM.java | 9 +++++++++ .../test/java/org/apache/hadoop/hbase/ipc/TestAsyncIPC.java | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e9e9cce8/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java index e55a7eb..26d6f18 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java @@ -120,7 +120,7 @@ public class AsyncRpcClient extends AbstractRpcClient { boolean epollEnabled = conf.getBoolean(USE_NATIVE_TRANSPORT, false); // Use the faster native epoll transport mechanism on linux if enabled - if (epollEnabled && JVM.isLinux()) { + if (epollEnabled && JVM.isLinux() && JVM.isAmd64()) { if (LOG.isDebugEnabled()) { LOG.debug("Create EpollEventLoopGroup with maxThreads = " + maxThreads); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e9e9cce8/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java index 9fb7037..2d6065b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java @@ -51,6 +51,7 @@ public class JVM { private static final boolean linux = System.getProperty("os.name").startsWith("Linux"); private static final String JVMVersion = System.getProperty("java.version"); + private static final boolean amd64 = System.getProperty("os.arch").contains("amd64"); /** * Constructor. Get the running Operating System instance @@ -79,6 +80,14 @@ public class JVM { public static boolean isLinux() { return linux; } + + /** + * Check if the arch is amd64; + * @return whether this is amd64 or not. + */ + public static boolean isAmd64() { + return amd64; + } /** * Check if the finish() method of GZIPOutputStream is broken http://git-wip-us.apache.org/repos/asf/hbase/blob/e9e9cce8/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestAsyncIPC.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestAsyncIPC.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestAsyncIPC.java index c977cfa..ca7c9a7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestAsyncIPC.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestAsyncIPC.java @@ -100,7 +100,7 @@ public class TestAsyncIPC extends AbstractTestIPC { private void setConf(Configuration conf) { conf.setBoolean(AsyncRpcClient.USE_NATIVE_TRANSPORT, useNativeTransport); - conf.setBoolean(AsyncRpcClient.USE_NATIVE_TRANSPORT, useGlobalEventLoopGroup); + conf.setBoolean(AsyncRpcClient.USE_GLOBAL_EVENT_LOOP_GROUP, useGlobalEventLoopGroup); if (useGlobalEventLoopGroup && AsyncRpcClient.GLOBAL_EVENT_LOOP_GROUP != null) { if (useNativeTransport && !(AsyncRpcClient.GLOBAL_EVENT_LOOP_GROUP.getFirst() instanceof EpollEventLoopGroup)