diff --git src/main/docbkx/troubleshooting.xml src/main/docbkx/troubleshooting.xml
index ffe0816..3a0887e 100644
--- src/main/docbkx/troubleshooting.xml
+++ src/main/docbkx/troubleshooting.xml
@@ -1264,9 +1264,93 @@ 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.callqueue.handler.factor
+ hbase.ipc.server.callqueue.handler.factor
+
+
+ ipc.server.callqueue.read.share
+ hbase.ipc.server.callqueue.read.share
+
+
+ ipc.server.callqueue.type
+ hbase.ipc.server.callqueue.type
+
+
+ ipc.server.queue.max.call.delay
+ hbase.ipc.server.queue.max.call.delay
+
+
+ ipc.server.max.callqueue.length
+ hbase.ipc.server.max.callqueue.length
+
+
+ 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
+
+
+ ipc.server.scan.vtime.weight
+ hbase.ipc.server.scan.vtime.weight
+
+
+
+
+
Running unit or integration tests