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

HADOOP-19271. NPE in AbfsManagedApacheHttpConnection.toString() when not connected (#7040)

Browse Source 
Contributed by: Pranav Saxena
This commit is contained in:
Pranav Saxena 2024-09-16 22:51:20 +05:30 committed by GitHub
parent ea6e0f7cd5
commit 4d968add52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 79 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsManagedApacheHttpConnection.java
View File

@ -27,6 +27,7 @@
import org.apache.http.HttpConnectionMetrics;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.conn.ManagedHttpClientConnection;
@ -51,10 +52,17 @@ class AbfsManagedApacheHttpConnection
*/
private AbfsManagedHttpClientContext managedHttpContext;
private final HttpHost targetHost;
private final int hashCode;
AbfsManagedApacheHttpConnection(ManagedHttpClientConnection conn,
final HttpRoute route) {
if (route != null) {
targetHost = route.getTargetHost();
} else {
targetHost = null;
}
this.httpClientConnection = conn;
this.hashCode = (UUID.randomUUID().toString()
+ httpClientConnection.getId()).hashCode();
@ -228,11 +236,9 @@ public int hashCode() {
@Override
public String toString() {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(
httpClientConnection.getRemoteAddress().getHostName())
.append(COLON)
.append(httpClientConnection.getRemotePort())
StringBuilder stringBuilder = targetHost != null ? new StringBuilder(
targetHost.toString()) : new StringBuilder();
stringBuilder
.append(COLON)
.append(hashCode());
return stringBuilder.toString();

68
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestApacheClientConnectionPool.java
View File

@ -18,6 +18,10 @@
package org.apache.hadoop.fs.azurebfs.services;
import java.io.IOException;
import java.util.Map;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.apache.hadoop.conf.Configuration;
@ -27,12 +31,26 @@
import org.apache.hadoop.fs.azurebfs.AbstractAbfsIntegrationTest;
import org.apache.hadoop.fs.azurebfs.AzureBlobFileSystem;
import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsDriverException;
import org.apache.hadoop.security.ssl.DelegatingSSLSocketFactory;
import org.apache.hadoop.util.functional.Tuples;
import org.apache.http.HttpHost;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder;
import org.apache.http.config.SocketConfig;
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.conn.DefaultHttpClientConnectionOperator;
import static org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants.COLON;
import static org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants.KEEP_ALIVE_CACHE_CLOSED;
import static org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys.FS_AZURE_NETWORKING_LIBRARY;
import static org.apache.hadoop.fs.azurebfs.constants.FileSystemUriSchemes.HTTPS_SCHEME;
import static org.apache.hadoop.fs.azurebfs.constants.HttpOperationType.APACHE_HTTP_CLIENT;
import static org.apache.hadoop.test.LambdaTestUtils.intercept;
import static org.apache.hadoop.test.LambdaTestUtils.verifyCause;
import static org.apache.http.conn.ssl.SSLConnectionSocketFactory.getDefaultHostnameVerifier;
/**
* This test class tests the exception handling in ABFS thrown by the
@ -60,4 +78,54 @@ public void testKacIsClosed() throws Throwable {
verifyCause(ClosedIOException.class, ex);
}
}
@Test
public void testNonConnectedConnectionLogging() throws Exception {
Map.Entry<HttpRoute, AbfsManagedApacheHttpConnection> testConnPair
= getTestConnection();
AbfsManagedApacheHttpConnection conn = testConnPair.getValue();
String log = conn.toString();
Assertions.assertThat(log.split(COLON).length)
.describedAs("Log to have three fields: https://host:port:hashCode")
.isEqualTo(4);
}
@Test
public void testConnectedConnectionLogging() throws Exception {
Map.Entry<HttpRoute, AbfsManagedApacheHttpConnection> testConnPair
= getTestConnection();
AbfsManagedApacheHttpConnection conn = testConnPair.getValue();
HttpRoute httpRoute = testConnPair.getKey();
Registry<ConnectionSocketFactory> socketFactoryRegistry
= RegistryBuilder.<ConnectionSocketFactory>create()
.register(HTTPS_SCHEME, new SSLConnectionSocketFactory(
DelegatingSSLSocketFactory.getDefaultFactory(),
getDefaultHostnameVerifier()))
.build();
new DefaultHttpClientConnectionOperator(
socketFactoryRegistry, null, null).connect(conn,
httpRoute.getTargetHost(), httpRoute.getLocalSocketAddress(),
getConfiguration().getHttpConnectionTimeout(), SocketConfig.DEFAULT,
new HttpClientContext());
String log = conn.toString();
Assertions.assertThat(log.split(COLON).length)
.describedAs("Log to have three fields: https://host:port:hashCode")
.isEqualTo(4);
}
private Map.Entry<HttpRoute, AbfsManagedApacheHttpConnection> getTestConnection()
throws IOException {
HttpHost host = new HttpHost(getFileSystem().getUri().getHost(),
getFileSystem().getUri().getPort(),
HTTPS_SCHEME);
HttpRoute httpRoute = new HttpRoute(host);
AbfsManagedApacheHttpConnection conn
= (AbfsManagedApacheHttpConnection) new AbfsHttpClientConnectionFactory().create(
httpRoute, null);
return Tuples.pair(httpRoute, conn);
}
}