Revert "HDFS-13388. RequestHedgingProxyProvider calls multiple configured NNs all the time. Contributed by Jinglun."
This reverts commit ac32b3576da4cc463dff85118163ccfff02215fc. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b5353c75 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b5353c75 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b5353c75 Branch: refs/heads/HDFS-7240 Commit: b5353c75d90b9299f04dba255b9e9af5a8cc19eb Parents: 4571351 Author: Inigo Goiri <inigo...@apache.org> Authored: Thu Apr 12 09:28:23 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Thu Apr 12 09:28:23 2018 -0700 ---------------------------------------------------------------------- .../ha/RequestHedgingProxyProvider.java | 3 -- .../ha/TestRequestHedgingProxyProvider.java | 34 -------------------- 2 files changed, 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5353c75/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java ---------------------------------------------------------------------- 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 1c38791..7b9cd64 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 class RequestHedgingProxyProvider<T> extends public Object invoke(Object proxy, final Method method, final Object[] args) throws Throwable { - if (currentUsedProxy != null) { - return method.invoke(currentUsedProxy.proxy, args); - } Map<Future<Object>, ProxyInfo<T>> proxyMap = new HashMap<>(); int numAttempts = 0; http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5353c75/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java ---------------------------------------------------------------------- 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 4b3fdf9..8d6b02d 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.Assert; 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; @@ -103,37 +100,6 @@ public class TestRequestHedgingProxyProvider { } @Test - public void testRequestNNAfterOneSuccess() throws Exception { - final AtomicInteger count = new AtomicInteger(0); - final ClientProtocol goodMock = mock(ClientProtocol.class); - when(goodMock.getStats()).thenAnswer(new Answer<long[]>() { - @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<long[]>() { - @Override - public long[] answer(InvocationOnMock invocation) throws Throwable { - count.incrementAndGet(); - throw new IOException("Bad mock !!"); - } - }); - - RequestHedgingProxyProvider<ClientProtocol> 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); Mockito.when(goodMock.getStats()).thenAnswer(new Answer<long[]>() { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
