You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2015/04/22 01:30:48 UTC
hbase git commit: HBASE-13499 AsyncRpcClient test cases failure in
powerpc
Repository: hbase
Updated Branches:
refs/heads/master 0b4e32a20 -> fe9180d79
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/fe9180d7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fe9180d7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fe9180d7
Branch: refs/heads/master
Commit: fe9180d79e993e615317c189a87eac1eacdc37b6
Parents: 0b4e32a
Author: zhangduo <zh...@wandoujia.com>
Authored: Tue Apr 14 22:04:14 2015 +0800
Committer: zhangduo <zh...@wandoujia.com>
Committed: Tue Apr 14 23:00:07 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/fe9180d7/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/fe9180d7/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/fe9180d7/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 69a79ad..18e3798 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
@@ -101,7 +101,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)