Skip to content

Commit 38b2915

Browse files
authored
HADOOP-18565. Complete outstanding items for the AWS SDK V2 upgrade. (#5421)
Changes include * use bundled transfer manager * adds transfer listener to upload * adds support for custom signers * don't set default endpoint * removes v1 sdk bundle, only use core package * implements region caching + many more Note: spotbugs is warning about inconsistent synchronization in accessing a new s3a FS field. This will be fixed in a follow-up patch. Contributed by Ahmar Suhail
1 parent 3671db2 commit 38b2915

File tree

60 files changed

+1306
-1579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1306
-1579
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/statistics/StoreStatisticNames.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,10 @@ public final class StoreStatisticNames {
407407
public static final String MULTIPART_UPLOAD_LIST
408408
= "multipart_upload_list";
409409

410+
/** Probe for store region: {@value}. */
411+
public static final String STORE_REGION_PROBE
412+
= "store_region_probe";
413+
410414
private StoreStatisticNames() {
411415
}
412416

hadoop-project/pom.xml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@
186186
<surefire.fork.timeout>900</surefire.fork.timeout>
187187
<aws-java-sdk.version>1.12.316</aws-java-sdk.version>
188188
<hsqldb.version>2.7.1</hsqldb.version>
189-
<aws-java-sdk-v2.version>2.18.19</aws-java-sdk-v2.version>
189+
<aws-java-sdk-v2.version>2.19.12</aws-java-sdk-v2.version>
190+
<awscrt.version>0.21.0</awscrt.version>
190191
<frontend-maven-plugin.version>1.11.2</frontend-maven-plugin.version>
191192
<jasmine-maven-plugin.version>2.1</jasmine-maven-plugin.version>
192193
<phantomjs-maven-plugin.version>0.7</phantomjs-maven-plugin.version>
@@ -1138,14 +1139,8 @@
11381139
</dependency>
11391140
<dependency>
11401141
<groupId>com.amazonaws</groupId>
1141-
<artifactId>aws-java-sdk-bundle</artifactId>
1142+
<artifactId>aws-java-sdk-core</artifactId>
11421143
<version>${aws-java-sdk.version}</version>
1143-
<exclusions>
1144-
<exclusion>
1145-
<groupId>io.netty</groupId>
1146-
<artifactId>*</artifactId>
1147-
</exclusion>
1148-
</exclusions>
11491144
</dependency>
11501145
<dependency>
11511146
<groupId>software.amazon.awssdk</groupId>
@@ -1159,15 +1154,9 @@
11591154
</exclusions>
11601155
</dependency>
11611156
<dependency>
1162-
<groupId>software.amazon.awssdk</groupId>
1163-
<artifactId>s3-transfer-manager</artifactId>
1164-
<version>${aws-java-sdk-v2.version}-PREVIEW</version>
1165-
<exclusions>
1166-
<exclusion>
1167-
<groupId>io.netty</groupId>
1168-
<artifactId>*</artifactId>
1169-
</exclusion>
1170-
</exclusions>
1157+
<groupId>software.amazon.awssdk.crt</groupId>
1158+
<artifactId>aws-crt</artifactId>
1159+
<version>${awscrt.version}</version>
11711160
</dependency>
11721161
<dependency>
11731162
<groupId>org.apache.mina</groupId>

hadoop-tools/hadoop-aws/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@
489489
</dependency>
490490
<dependency>
491491
<groupId>com.amazonaws</groupId>
492-
<artifactId>aws-java-sdk-bundle</artifactId>
492+
<artifactId>aws-java-sdk-core</artifactId>
493493
<scope>compile</scope>
494494
</dependency>
495495
<dependency>
@@ -498,8 +498,8 @@
498498
<scope>compile</scope>
499499
</dependency>
500500
<dependency>
501-
<groupId>software.amazon.awssdk</groupId>
502-
<artifactId>s3-transfer-manager</artifactId>
501+
<groupId>software.amazon.awssdk.crt</groupId>
502+
<artifactId>aws-crt</artifactId>
503503
<scope>compile</scope>
504504
</dependency>
505505
<dependency>

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ private Constants() {
585585

586586
public static final String SIGNING_ALGORITHM_STS =
587587
"fs.s3a." + Constants.AWS_SERVICE_IDENTIFIER_STS.toLowerCase()
588-
+ "signing-algorithm";
588+
+ ".signing-algorithm";
589589

590590
public static final String S3N_FOLDER_SUFFIX = "_$folder$";
591591
public static final String FS_S3A_BLOCK_SIZE = "fs.s3a.block.size";

0 commit comments

Comments
 (0)