From 94bd157d214f05e820d2ea7521e685f4e00f24af Mon Sep 17 00:00:00 2001
From: Zhihong Yu <tedyu@apache.org>
Date: Fri, 4 Jan 2013 18:21:39 +0000
Subject: [PATCH] HBASE-7450 orphan RPC connection in HBaseClient leaves "null"
 out member, causing NPE in HCM (Zavier Gao)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1429017 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/hadoop/hbase/ipc/HBaseClient.java  |  12 ++-
 .../org/apache/hadoop/hbase/ipc/TestIPC.java  | 100 ++++++++++++++++++
 2 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
index 79ff1bb0279..bbb91d3ef72 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
@@ -847,11 +847,17 @@ public class HBaseClient {
           start();
           return;
         }
-      } catch (IOException e) {
+      } catch (Throwable t) {
         failedServers.addToFailedServers(remoteId.address);
-        markClosed(e);
+        IOException e = null;
+        if (t instanceof IOException) {
+          e = (IOException)t;
+          markClosed(e);
+        } else {
+          e = new IOException("Coundn't set up IO Streams", t);
+          markClosed(e);
+        }
         close();
-
         throw e;
       }
     }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java
new file mode 100644
index 00000000000..a1fa7b6a2e6
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java
@@ -0,0 +1,100 @@
+/**
+  *
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+package org.apache.hadoop.hbase.ipc;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.net.InetSocketAddress;
+import java.net.SocketTimeoutException;
+import javax.net.SocketFactory;
+import java.lang.reflect.Method;
+import java.util.*;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.mockito.Mockito.*;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.hbase.monitoring.MonitoredRPCHandler;
+import org.apache.hadoop.hbase.SmallTests;
+
+import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody;
+import com.google.protobuf.Message;
+import org.apache.hadoop.hbase.security.User;
+
+import org.apache.commons.logging.*;
+import org.apache.log4j.Logger;
+
+@Category(SmallTests.class)
+public class TestIPC {
+  public static final Log LOG = LogFactory.getLog(TestIPC.class);
+  private static final Random RANDOM = new Random();
+
+  private static class TestRpcServer extends HBaseServer {
+    TestRpcServer() throws IOException {
+      super("0.0.0.0", 0, 1, 1, HBaseConfiguration.create(), "TestRpcServer", 0);
+    }
+
+    @Override
+    public Message call(Class<? extends VersionedProtocol> protocol,
+        RpcRequestBody rpcRequest, 
+        long receiveTime, 
+        MonitoredRPCHandler status) throws IOException {
+      return rpcRequest;
+    }
+  }
+
+  @Test
+  public void testRTEDuringConnectionSetup() throws Exception {
+    Configuration conf = HBaseConfiguration.create();
+    SocketFactory spyFactory = spy(NetUtils.getDefaultSocketFactory(conf));
+    Mockito.doAnswer(new Answer<Socket>() {
+      @Override
+      public Socket answer(InvocationOnMock invocation) throws Throwable {
+        Socket s = spy((Socket)invocation.callRealMethod());
+        doThrow(new RuntimeException("Injected fault")).when(s).setSoTimeout(anyInt());
+        return s;
+      }
+    }).when(spyFactory).createSocket();
+
+    TestRpcServer rpcServer = new TestRpcServer();
+    rpcServer.start();
+
+    HBaseClient client = new HBaseClient(
+        conf,
+        spyFactory);
+    InetSocketAddress address = rpcServer.getListenerAddress();
+
+    try {
+      client.call(RpcRequestBody.getDefaultInstance(), address, User.getCurrent(), 0);
+      fail("Expected an exception to have been thrown!");
+    } catch (Exception e) {
+      LOG.info("Caught expected exception: " + e.toString());
+      assertTrue(StringUtils.stringifyException(e).contains("Injected fault"));
+    }
+  }
+}