diff --git src/main/docbkx/configuration.xml src/main/docbkx/configuration.xml
index d2798da..b0b2864 100644
--- src/main/docbkx/configuration.xml
+++ src/main/docbkx/configuration.xml
@@ -1309,7 +1309,7 @@ index e70ebc6..96f8c27 100644
requests to user tables. The rule of thumb is to keep this number low when the payload per
request approaches the MB (big puts, scans using a large cache) and high when the payload
is small (gets, small puts, ICVs, deletes). The total size of the queries in progress is
- limited by the setting "ipc.server.max.callqueue.size".
+ limited by the setting "hbase.ipc.server.max.callqueue.size".
It is safe to set that number to the maximum number of incoming clients if their
payload is small, the typical example being a cluster that serves a website since puts
aren't typically buffered and most of the operations are gets.
diff --git src/main/docbkx/troubleshooting.xml src/main/docbkx/troubleshooting.xml
index e3cfb1a..42e5d4a 100644
--- src/main/docbkx/troubleshooting.xml
+++ src/main/docbkx/troubleshooting.xml
@@ -1258,9 +1258,69 @@ sv4r6s38: at org.apache.hadoop.security.UserGroupInformation.ensureInitial
linkend="maven.build.hadoop" /> for more).
-
+
+
+ IPC Configuration Conflicts with Hadoop
+ If the Hadoop configuration is loaded after the HBase configuration, and you have
+ configured custom IPC settings in both HBase and Hadoop, the Hadoop values may overwrite the
+ HBase values. There is normally no need to change these settings for HBase, so this problem is
+ an edge case. However, HBASE-11492 renames
+ these settings for HBase to remove the chance of a conflict. Each of the setting names have
+ been prefixed with hbase., as shown in the following table. No action is
+ required related to these changes unless you are already experiencing a conflict.
+
+
+
+
+ Old Name
+ New Name
+
+
+
+
+ ipc.server.listen.queue.size
+ hbase.ipc.server.listen.queue.size
+
+
+ ipc.server.max.callqueue.size
+ hbase.ipc.server.max.callqueue.size
+
+
+ ipc.server.read.threadpool.size
+ hbase.ipc.server.read.threadpool.size
+
+
+ ipc.server.tcpkeepalive
+ hbase.ipc.server.tcpkeepalive
+
+
+ ipc.server.tcpnodelay
+ hbase.ipc.server.tcpnodelay
+
+
+ ipc.client.call.purge.timeout
+ hbase.ipc.client.call.purge.timeout
+
+
+ ipc.client.connection.maxidletime
+ hbase.ipc.client.connection.maxidletime
+
+
+ ipc.client.idlethreshold
+ hbase.ipc.client.idlethreshold
+
+
+ ipc.client.kill.max
+ hbase.ipc.client.kill.max
+
+
+
+
+
Running unit or integration tests