This is an automated email from the ASF dual-hosted git repository.
yuqi1129 pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-1.3 by this push:
new ab67e9cbec [Cherry-pick to branch-1.3] [11391] fix(bundles): run
FilesetS3CatalogIT hangs on macOS (#11393) (#11395)
ab67e9cbec is described below
commit ab67e9cbec99f1ebec90de3ace041ba217d772be
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 3 15:56:58 2026 +0800
[Cherry-pick to branch-1.3] [11391] fix(bundles): run FilesetS3CatalogIT
hangs on macOS (#11393) (#11395)
**Cherry-pick Information:**
- Original commit: 2311c4be8f8d1c55ea2d53813e3b895f43330894
- Target branch: `branch-1.3`
- Status: ✅ Clean cherry-pick (no conflicts)
Co-authored-by: tian bao <[email protected]>
---
.../main/java/org/apache/gravitino/s3/fs/S3FileSystemProvider.java | 3 ++-
.../catalog/fileset/integration/test/FilesetS3CatalogIT.java | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/bundles/aws/src/main/java/org/apache/gravitino/s3/fs/S3FileSystemProvider.java
b/bundles/aws/src/main/java/org/apache/gravitino/s3/fs/S3FileSystemProvider.java
index 4e4d6152d2..07cf221d74 100644
---
a/bundles/aws/src/main/java/org/apache/gravitino/s3/fs/S3FileSystemProvider.java
+++
b/bundles/aws/src/main/java/org/apache/gravitino/s3/fs/S3FileSystemProvider.java
@@ -61,7 +61,8 @@ public class S3FileSystemProvider implements
FileSystemProvider, SupportsCredent
ImmutableMap.of(
S3Properties.GRAVITINO_S3_ENDPOINT, Constants.ENDPOINT,
S3Properties.GRAVITINO_S3_ACCESS_KEY_ID, Constants.ACCESS_KEY,
- S3Properties.GRAVITINO_S3_SECRET_ACCESS_KEY, Constants.SECRET_KEY);
+ S3Properties.GRAVITINO_S3_SECRET_ACCESS_KEY, Constants.SECRET_KEY,
+ S3Properties.GRAVITINO_S3_PATH_STYLE_ACCESS,
Constants.PATH_STYLE_ACCESS);
// We can't use Constants.AWS_CREDENTIALS_PROVIDER directly, as in 2.7, this
key does not exist.
private static final String S3_CREDENTIAL_KEY =
"fs.s3a.aws.credentials.provider";
diff --git
a/catalogs/catalog-fileset/src/test/java/org/apache/gravitino/catalog/fileset/integration/test/FilesetS3CatalogIT.java
b/catalogs/catalog-fileset/src/test/java/org/apache/gravitino/catalog/fileset/integration/test/FilesetS3CatalogIT.java
index 39fc58e398..21cb1739c7 100644
---
a/catalogs/catalog-fileset/src/test/java/org/apache/gravitino/catalog/fileset/integration/test/FilesetS3CatalogIT.java
+++
b/catalogs/catalog-fileset/src/test/java/org/apache/gravitino/catalog/fileset/integration/test/FilesetS3CatalogIT.java
@@ -107,7 +107,7 @@ public class FilesetS3CatalogIT extends FilesetCatalogIT {
LOG.info("Secret key: " + secretKey);
s3Endpoint =
- String.format("http://%s:%d";,
gravitinoLocalStackContainer.getContainerIpAddress(), 4566);
+ String.format("http://localhost:%d";,
gravitinoLocalStackContainer.getMappedPort(4566));
}
@BeforeAll
@@ -132,6 +132,7 @@ public class FilesetS3CatalogIT extends FilesetCatalogIT {
conf.set("fs.s3a.access.key", accessKey);
conf.set("fs.s3a.secret.key", secretKey);
conf.set("fs.s3a.endpoint", s3Endpoint);
+ conf.set("fs.s3a.path.style.access", "true");
conf.set(
"fs.s3a.aws.credentials.provider",
"org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider");
fileSystem = FileSystem.get(URI.create(String.format("s3a://%s",
bucketName)), conf);
@@ -180,6 +181,7 @@ public class FilesetS3CatalogIT extends FilesetCatalogIT {
map.put(S3Properties.GRAVITINO_S3_ENDPOINT, s3Endpoint);
map.put(S3Properties.GRAVITINO_S3_ACCESS_KEY_ID, accessKey);
map.put(S3Properties.GRAVITINO_S3_SECRET_ACCESS_KEY, secretKey);
+ map.put(S3Properties.GRAVITINO_S3_PATH_STYLE_ACCESS, "true");
map.put(FILESYSTEM_PROVIDERS, "s3");
metalake.createCatalog(catalogName, Catalog.Type.FILESET, provider,
"comment", map);
@@ -201,6 +203,7 @@ public class FilesetS3CatalogIT extends FilesetCatalogIT {
catalogProps.put(S3Properties.GRAVITINO_S3_ENDPOINT, s3Endpoint);
catalogProps.put(S3Properties.GRAVITINO_S3_ACCESS_KEY_ID, accessKey);
catalogProps.put(S3Properties.GRAVITINO_S3_SECRET_ACCESS_KEY, secretKey);
+ catalogProps.put(S3Properties.GRAVITINO_S3_PATH_STYLE_ACCESS, "true");
catalogProps.put(FILESYSTEM_PROVIDERS, "s3");
Catalog localCatalog =
