Repository: hbase Updated Branches: refs/heads/0.98 9f6485b8b -> ffa460ec6
Revert "HBASE-12825 CallRunner exception messages should include destination host:port" This reverts commit 5210854b9b49e5d9f6ac34ad37987f4c8ddf2e15. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ffa460ec Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ffa460ec Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ffa460ec Branch: refs/heads/0.98 Commit: ffa460ec66c5bf1f78a53c8cc181d9bac1bbf856 Parents: 9f6485b Author: Andrew Purtell <apurt...@apache.org> Authored: Fri Jan 9 17:28:37 2015 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri Jan 9 17:28:37 2015 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ffa460ec/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java index 200c112..18e2902 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java @@ -48,6 +48,8 @@ public class CallRunner { * On construction, adds the size of this call to the running count of outstanding call sizes. * Presumption is that we are put on a queue while we wait on an executor to run us. During this * time we occupy heap. + * @param call The call to run. + * @param rpcServer */ // The constructor is shutdown so only RpcServer in this class can make one of these. CallRunner(final RpcServerInterface rpcServer, final Call call, UserProvider userProvider) { @@ -95,8 +97,7 @@ public class CallRunner { TraceScope traceScope = null; try { if (!this.rpcServer.isStarted()) { - throw new ServerNotRunningYetException("Server " + rpcServer.getListenerAddress() - + " is not running yet"); + throw new ServerNotRunningYetException("Server is not running yet"); } if (call.tinfo != null) { traceScope = Trace.startSpan(call.toTraceString(), call.tinfo); @@ -141,7 +142,7 @@ public class CallRunner { } } catch (ClosedChannelException cce) { RpcServer.LOG.warn(Thread.currentThread().getName() + ": caught a ClosedChannelException, " + - "this means that the server " + rpcServer.getListenerAddress() + " was processing a " + + "this means that the server was processing a " + "request but the client went away. The error message was: " + cce.getMessage()); } catch (Exception e) {
