forked from apache/hadoop
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
HADOOP-18073. Upgrades Head, Copy, Put & Get operations. #5
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
247 changes: 247 additions & 0 deletions
247
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/AWSClientConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,247 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.fs.s3a; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.time.Duration; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; | ||
| import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption; | ||
| import software.amazon.awssdk.core.retry.RetryPolicy; | ||
| import software.amazon.awssdk.http.apache.ApacheHttpClient; | ||
| import software.amazon.awssdk.http.apache.ProxyConfiguration; | ||
| import software.amazon.awssdk.thirdparty.org.apache.http.client.utils.URIBuilder; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.util.VersionInfo; | ||
|
|
||
| import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_ESTABLISH_TIMEOUT; | ||
| import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_MAXIMUM_CONNECTIONS; | ||
| import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_MAX_ERROR_RETRIES; | ||
| import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_REQUEST_TIMEOUT; | ||
| import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_SECURE_CONNECTIONS; | ||
| import static org.apache.hadoop.fs.s3a.Constants.DEFAULT_SOCKET_TIMEOUT; | ||
| import static org.apache.hadoop.fs.s3a.Constants.ESTABLISH_TIMEOUT; | ||
| import static org.apache.hadoop.fs.s3a.Constants.MAXIMUM_CONNECTIONS; | ||
| import static org.apache.hadoop.fs.s3a.Constants.MAX_ERROR_RETRIES; | ||
| import static org.apache.hadoop.fs.s3a.Constants.PROXY_DOMAIN; | ||
| import static org.apache.hadoop.fs.s3a.Constants.PROXY_HOST; | ||
| import static org.apache.hadoop.fs.s3a.Constants.PROXY_PASSWORD; | ||
| import static org.apache.hadoop.fs.s3a.Constants.PROXY_PORT; | ||
| import static org.apache.hadoop.fs.s3a.Constants.PROXY_USERNAME; | ||
| import static org.apache.hadoop.fs.s3a.Constants.PROXY_WORKSTATION; | ||
| import static org.apache.hadoop.fs.s3a.Constants.REQUEST_TIMEOUT; | ||
| import static org.apache.hadoop.fs.s3a.Constants.SECURE_CONNECTIONS; | ||
| import static org.apache.hadoop.fs.s3a.Constants.SOCKET_TIMEOUT; | ||
| import static org.apache.hadoop.fs.s3a.Constants.USER_AGENT_PREFIX; | ||
|
|
||
| /** | ||
| * Methods for configuring the S3 client. | ||
| * These methods are used when creating and configuring | ||
| * {@link software.amazon.awssdk.services.s3.S3Client} which communicates with the S3 service. | ||
| */ | ||
| public final class AWSClientConfig { | ||
| private static final Logger LOG = LoggerFactory.getLogger(AWSClientConfig.class); | ||
|
|
||
| private AWSClientConfig() { | ||
| } | ||
|
|
||
| public static ClientOverrideConfiguration.Builder createClientConfigBuilder(Configuration conf) { | ||
| ClientOverrideConfiguration.Builder overrideConfigBuilder = | ||
| ClientOverrideConfiguration.builder(); | ||
|
|
||
| initRequestTimeout(conf, overrideConfigBuilder); | ||
|
|
||
| initUserAgent(conf, overrideConfigBuilder); | ||
|
|
||
| // TODO: Look at signers. See issue https://github.com/aws/aws-sdk-java-v2/issues/1024 | ||
| // String signerOverride = conf.getTrimmed(SIGNING_ALGORITHM, ""); | ||
| // if (!signerOverride.isEmpty()) { | ||
| // LOG.debug("Signer override = {}", signerOverride); | ||
| // overrideConfigBuilder.putAdvancedOption(SdkAdvancedClientOption.SIGNER) | ||
| // } | ||
|
|
||
| return overrideConfigBuilder; | ||
| } | ||
|
|
||
| /** | ||
| * Configures the http client. | ||
| * | ||
| * @param conf The Hadoop configuration | ||
| * @return Http client builder | ||
| */ | ||
| public static ApacheHttpClient.Builder createHttpClientBuilder(Configuration conf) { | ||
| ApacheHttpClient.Builder httpClientBuilder = | ||
| ApacheHttpClient.builder(); | ||
|
|
||
| httpClientBuilder.maxConnections(S3AUtils.intOption(conf, MAXIMUM_CONNECTIONS, | ||
| DEFAULT_MAXIMUM_CONNECTIONS, 1)); | ||
|
|
||
| int connectionEstablishTimeout = | ||
| S3AUtils.intOption(conf, ESTABLISH_TIMEOUT, DEFAULT_ESTABLISH_TIMEOUT, 0); | ||
| int socketTimeout = S3AUtils.intOption(conf, SOCKET_TIMEOUT, DEFAULT_SOCKET_TIMEOUT, 0); | ||
|
|
||
| httpClientBuilder.connectionTimeout(Duration.ofSeconds(connectionEstablishTimeout)); | ||
| httpClientBuilder.socketTimeout(Duration.ofSeconds(socketTimeout)); | ||
|
|
||
| // TODO: Need to set ssl socket factory, as done in | ||
| // NetworkBinding.bindSSLChannelMode(conf, awsConf); | ||
|
|
||
| return httpClientBuilder; | ||
| } | ||
|
|
||
| /** | ||
| * Configures the retry policy. | ||
| * | ||
| * @param conf The Hadoop configuration | ||
| * @return Retry policy builder | ||
| */ | ||
| public static RetryPolicy.Builder createRetryPolicyBuilder(Configuration conf) { | ||
|
|
||
| RetryPolicy.Builder retryPolicyBuilder = RetryPolicy.builder(); | ||
|
|
||
| retryPolicyBuilder.numRetries(S3AUtils.intOption(conf, MAX_ERROR_RETRIES, | ||
| DEFAULT_MAX_ERROR_RETRIES, 0)); | ||
|
|
||
| return retryPolicyBuilder; | ||
| } | ||
|
|
||
| /** | ||
| * Configures the proxy. | ||
| * | ||
| * @param conf The Hadoop configuration | ||
| * @param bucket Optional bucket to use to look up per-bucket proxy secrets | ||
| * @return Proxy configuration builder | ||
| * @throws IOException on any IO problem | ||
| */ | ||
| public static ProxyConfiguration.Builder createProxyConfigurationBuilder(Configuration conf, | ||
| String bucket) throws IOException { | ||
|
|
||
| ProxyConfiguration.Builder proxyConfigBuilder = ProxyConfiguration.builder(); | ||
|
|
||
| String proxyHost = conf.getTrimmed(PROXY_HOST, ""); | ||
| int proxyPort = conf.getInt(PROXY_PORT, -1); | ||
|
|
||
| if (!proxyHost.isEmpty()) { | ||
| if (proxyPort >= 0) { | ||
| proxyConfigBuilder.endpoint(buildURI(proxyHost, proxyPort)); | ||
| } else { | ||
| if (conf.getBoolean(SECURE_CONNECTIONS, DEFAULT_SECURE_CONNECTIONS)) { | ||
| LOG.warn("Proxy host set without port. Using HTTPS default 443"); | ||
| proxyConfigBuilder.endpoint(buildURI(proxyHost, 443)); | ||
| } else { | ||
| LOG.warn("Proxy host set without port. Using HTTP default 80"); | ||
| proxyConfigBuilder.endpoint(buildURI(proxyHost, 80)); | ||
| } | ||
| } | ||
| final String proxyUsername = S3AUtils.lookupPassword(bucket, conf, PROXY_USERNAME, | ||
| null, null); | ||
| final String proxyPassword = S3AUtils.lookupPassword(bucket, conf, PROXY_PASSWORD, | ||
| null, null); | ||
| if ((proxyUsername == null) != (proxyPassword == null)) { | ||
| String msg = "Proxy error: " + PROXY_USERNAME + " or " + | ||
| PROXY_PASSWORD + " set without the other."; | ||
| LOG.error(msg); | ||
| throw new IllegalArgumentException(msg); | ||
| } | ||
| proxyConfigBuilder.username(proxyUsername); | ||
| proxyConfigBuilder.password(proxyPassword); | ||
| proxyConfigBuilder.ntlmDomain(conf.getTrimmed(PROXY_DOMAIN)); | ||
| proxyConfigBuilder.ntlmWorkstation(conf.getTrimmed(PROXY_WORKSTATION)); | ||
| if (LOG.isDebugEnabled()) { | ||
| LOG.debug("Using proxy server {}:{} as user {} with password {} on " | ||
| + "domain {} as workstation {}", proxyHost, proxyPort, proxyUsername, proxyPassword, | ||
| PROXY_DOMAIN, PROXY_WORKSTATION); | ||
| } | ||
| } else if (proxyPort >= 0) { | ||
| String msg = | ||
| "Proxy error: " + PROXY_PORT + " set without " + PROXY_HOST; | ||
| LOG.error(msg); | ||
| throw new IllegalArgumentException(msg); | ||
| } | ||
|
|
||
| return proxyConfigBuilder; | ||
| } | ||
|
|
||
| /*** | ||
| * Builds a URI, throws an IllegalArgumentException in case of errors. | ||
| * | ||
| * @param host proxy host | ||
| * @param port proxy port | ||
| * @return uri with host and port | ||
| */ | ||
| private static URI buildURI(String host, int port) { | ||
| try { | ||
| return new URIBuilder().setHost(host).setPort(port).build(); | ||
| } catch (URISyntaxException e) { | ||
| String msg = | ||
| "Proxy error: incorrect " + PROXY_HOST + " or " + PROXY_PORT; | ||
| LOG.error(msg); | ||
| throw new IllegalArgumentException(msg); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Initializes the User-Agent header to send in HTTP requests to AWS | ||
| * services. We always include the Hadoop version number. The user also | ||
| * may set an optional custom prefix to put in front of the Hadoop version | ||
| * number. The AWS SDK internally appends its own information, which seems | ||
| * to include the AWS SDK version, OS and JVM version. | ||
| * | ||
| * @param conf Hadoop configuration | ||
| * @param clientConfig AWS SDK configuration to update | ||
| */ | ||
| private static void initUserAgent(Configuration conf, | ||
| ClientOverrideConfiguration.Builder clientConfig) { | ||
| String userAgent = "Hadoop " + VersionInfo.getVersion(); | ||
| String userAgentPrefix = conf.getTrimmed(USER_AGENT_PREFIX, ""); | ||
| if (!userAgentPrefix.isEmpty()) { | ||
| userAgent = userAgentPrefix + ", " + userAgent; | ||
| } | ||
| LOG.debug("Using User-Agent: {}", userAgent); | ||
| clientConfig.putAdvancedOption(SdkAdvancedClientOption.USER_AGENT_PREFIX, userAgent); | ||
| } | ||
|
|
||
| /** | ||
| * Configures request timeout. | ||
| * | ||
| * @param conf Hadoop configuration | ||
| * @param clientConfig AWS SDK configuration to update | ||
| */ | ||
| private static void initRequestTimeout(Configuration conf, | ||
| ClientOverrideConfiguration.Builder clientConfig) { | ||
| long requestTimeoutMillis = conf.getTimeDuration(REQUEST_TIMEOUT, | ||
| DEFAULT_REQUEST_TIMEOUT, TimeUnit.SECONDS, TimeUnit.MILLISECONDS); | ||
|
|
||
| if (requestTimeoutMillis > Integer.MAX_VALUE) { | ||
| LOG.debug("Request timeout is too high({} ms). Setting to {} ms instead", | ||
| requestTimeoutMillis, Integer.MAX_VALUE); | ||
| requestTimeoutMillis = Integer.MAX_VALUE; | ||
| } | ||
|
|
||
| if(requestTimeoutMillis > 0) { | ||
| clientConfig.apiCallAttemptTimeout(Duration.ofMillis(requestTimeoutMillis)); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this needs to be updated to set scheme!