diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java index 1c38791078..7b9cd64dc5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java @@ -79,9 +79,6 @@ public RequestHedgingInvocationHandler( public Object invoke(Object proxy, final Method method, final Object[] args) throws Throwable { - if (currentUsedProxy != null) { - return method.invoke(currentUsedProxy.proxy, args); - } Map, ProxyInfo> proxyMap = new HashMap<>(); int numAttempts = 0; diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java index 4b3fdf9b70..8d6b02dc15 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java @@ -43,13 +43,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.mock; import com.google.common.collect.Lists; @@ -102,37 +99,6 @@ public long[] answer(InvocationOnMock invocation) throws Throwable { Mockito.verify(goodMock).getStats(); } - @Test - public void testRequestNNAfterOneSuccess() throws Exception { - final AtomicInteger count = new AtomicInteger(0); - final ClientProtocol goodMock = mock(ClientProtocol.class); - when(goodMock.getStats()).thenAnswer(new Answer() { - @Override - public long[] answer(InvocationOnMock invocation) throws Throwable { - count.incrementAndGet(); - Thread.sleep(1000); - return new long[]{1}; - } - }); - final ClientProtocol badMock = mock(ClientProtocol.class); - when(badMock.getStats()).thenAnswer(new Answer() { - @Override - public long[] answer(InvocationOnMock invocation) throws Throwable { - count.incrementAndGet(); - throw new IOException("Bad mock !!"); - } - }); - - RequestHedgingProxyProvider provider = - new RequestHedgingProxyProvider<>(conf, nnUri, ClientProtocol.class, - createFactory(badMock, goodMock, goodMock, badMock)); - ClientProtocol proxy = provider.getProxy().proxy; - proxy.getStats(); - assertEquals(2, count.get()); - proxy.getStats(); - assertEquals(3, count.get()); - } - @Test public void testHedgingWhenOneIsSlow() throws Exception { final ClientProtocol goodMock = Mockito.mock(ClientProtocol.class);