big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "HDFS-13388. RequestHedgingProxyProvider calls multiple configured NNs all the time. Contributed by Jinglun."

Browse Source 
This reverts commit ac32b3576d.
This commit is contained in:
Inigo Goiri 2018-04-12 09:28:23 -07:00
parent 4571351ccc
commit b5353c75d9
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
View File

@ -79,9 +79,6 @@ public RequestHedgingInvocationHandler(
public Object public Object
invoke(Object proxy, final Method method, final Object[] args) invoke(Object proxy, final Method method, final Object[] args)
throws Throwable { throws Throwable {
if (currentUsedProxy != null) {
return method.invoke(currentUsedProxy.proxy, args);
}
Map<Future<Object>, ProxyInfo<T>> proxyMap = new HashMap<>(); Map<Future<Object>, ProxyInfo<T>> proxyMap = new HashMap<>();
int numAttempts = 0; int numAttempts = 0;

34
hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java
View File

@ -43,13 +43,10 @@
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.assertEquals;
import org.mockito.Matchers; import org.mockito.Matchers;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@ -102,37 +99,6 @@ public long[] answer(InvocationOnMock invocation) throws Throwable {
Mockito.verify(goodMock).getStats(); 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<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 @Test
public void testHedgingWhenOneIsSlow() throws Exception { public void testHedgingWhenOneIsSlow() throws Exception {
final ClientProtocol goodMock = Mockito.mock(ClientProtocol.class); final ClientProtocol goodMock = Mockito.mock(ClientProtocol.class);