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

HADOOP-18245 Extend KMS related exceptions that get mapped to ConnectException (#4329)

Browse Source
This commit is contained in:
Ritesh H Shukla 2022-05-19 13:20:24 -07:00 committed by GitHub
parent 0e6a6d1880
commit 78008bc0ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java
View File

@ -21,6 +21,7 @@
import java.io.IOException; import java.io.IOException;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
import java.net.ConnectException; import java.net.ConnectException;
import java.net.SocketException;
import java.net.URI; import java.net.URI;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
@ -29,6 +30,7 @@
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLHandshakeException;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@ -182,10 +184,10 @@ private <T> T doOp(ProviderCallable<T> op, int currPos,
} catch (IOException ioe) { } catch (IOException ioe) {
LOG.warn("KMS provider at [{}] threw an IOException: ", LOG.warn("KMS provider at [{}] threw an IOException: ",
provider.getKMSUrl(), ioe); provider.getKMSUrl(), ioe);
// SSLHandshakeException can occur here because of lost connection // SSLException can occur here because of lost connection
// with the KMS server, creating a ConnectException from it, // with the KMS server, creating a ConnectException from it,
// so that the FailoverOnNetworkExceptionRetry policy will retry // so that the FailoverOnNetworkExceptionRetry policy will retry
if (ioe instanceof SSLHandshakeException) { if (ioe instanceof SSLException || ioe instanceof SocketException) {
Exception cause = ioe; Exception cause = ioe;
ioe = new ConnectException("SSLHandshakeException: " ioe = new ConnectException("SSLHandshakeException: "
+ cause.getMessage()); + cause.getMessage());

12
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java
View File

@ -31,6 +31,7 @@
import java.io.IOException; import java.io.IOException;
import java.net.ConnectException; import java.net.ConnectException;
import java.net.NoRouteToHostException; import java.net.NoRouteToHostException;
import java.net.SocketException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.net.URI; import java.net.URI;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@ -41,6 +42,7 @@
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLHandshakeException;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@ -707,16 +709,18 @@ public void testClientRetriesWithSSLHandshakeExceptionSucceedsSecondTime()
throws Exception { throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
conf.setInt( conf.setInt(
CommonConfigurationKeysPublic.KMS_CLIENT_FAILOVER_MAX_RETRIES_KEY, 3); CommonConfigurationKeysPublic.KMS_CLIENT_FAILOVER_MAX_RETRIES_KEY, 5);
final String keyName = "test"; final String keyName = "test";
KMSClientProvider p1 = mock(KMSClientProvider.class); KMSClientProvider p1 = mock(KMSClientProvider.class);
when(p1.createKey(Mockito.anyString(), Mockito.any(Options.class))) when(p1.createKey(Mockito.anyString(), Mockito.any(Options.class)))
.thenThrow(new SSLHandshakeException("p1")) .thenThrow(new SSLHandshakeException("p1"))
.thenThrow(new SSLException("p1"))
.thenReturn(new KMSClientProvider.KMSKeyVersion(keyName, "v1", .thenReturn(new KMSClientProvider.KMSKeyVersion(keyName, "v1",
new byte[0])); new byte[0]));
KMSClientProvider p2 = mock(KMSClientProvider.class); KMSClientProvider p2 = mock(KMSClientProvider.class);
when(p2.createKey(Mockito.anyString(), Mockito.any(Options.class))) when(p2.createKey(Mockito.anyString(), Mockito.any(Options.class)))
.thenThrow(new ConnectException("p2")); .thenThrow(new ConnectException("p2"))
.thenThrow(new SocketException("p1"));
when(p1.getKMSUrl()).thenReturn("p1"); when(p1.getKMSUrl()).thenReturn("p1");
when(p2.getKMSUrl()).thenReturn("p2"); when(p2.getKMSUrl()).thenReturn("p2");
@ -725,9 +729,9 @@ public void testClientRetriesWithSSLHandshakeExceptionSucceedsSecondTime()
new KMSClientProvider[] {p1, p2}, 0, conf); new KMSClientProvider[] {p1, p2}, 0, conf);
kp.createKey(keyName, new Options(conf)); kp.createKey(keyName, new Options(conf));
verify(p1, Mockito.times(2)).createKey(Mockito.eq(keyName), verify(p1, Mockito.times(3)).createKey(Mockito.eq(keyName),
Mockito.any(Options.class)); Mockito.any(Options.class));
verify(p2, Mockito.times(1)).createKey(Mockito.eq(keyName), verify(p2, Mockito.times(2)).createKey(Mockito.eq(keyName),
Mockito.any(Options.class)); Mockito.any(Options.class));
} }