Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cpp/velox/utils/ConfigExtractor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ void getS3HiveConfig(
{S3Config::Keys::kIamRole, std::make_pair("iam.role", std::nullopt)},
{S3Config::Keys::kIamRoleSessionName, std::make_pair("iam.role.session.name", "gluten-session")},
{S3Config::Keys::kEndpointRegion, std::make_pair("endpoint.region", std::nullopt)},
{S3Config::Keys::kIMDSEnabled, std::make_pair("aws.imds.enabled", "true")},
};

// get Velox S3 config key from Spark Suffix.
Expand Down Expand Up @@ -124,6 +125,7 @@ void getS3HiveConfig(
setConfigIfPresent(S3Config::Keys::kSocketTimeout);
setConfigIfPresent(S3Config::Keys::kConnectTimeout);
setConfigIfPresent(S3Config::Keys::kEndpointRegion);
setConfigIfPresent(S3Config::Keys::kIMDSEnabled);

hiveConfMap[S3Config::kS3LogLevel] = conf->get<std::string>(kVeloxAwsSdkLogLevel, kVeloxAwsSdkLogLevelDefault);
hiveConfMap[S3Config::baseConfigKey(S3Config::Keys::kUseProxyFromEnv)] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,8 @@ object GlutenConfig extends ConfigRegistry {
val SPARK_S3_CONNECTION_MAXIMUM: String = HADOOP_PREFIX + S3_CONNECTION_MAXIMUM
val S3_ENDPOINT_REGION = "fs.s3a.endpoint.region"
val SPARK_S3_ENDPOINT_REGION: String = HADOOP_PREFIX + S3_ENDPOINT_REGION
val S3_AWS_IMDS_ENABLED = "fs.s3a.aws.imds.enabled"
val SPARK_S3_AWS_IMDS_ENABLED: String = HADOOP_PREFIX + S3_AWS_IMDS_ENABLED

// ABFS config
val ABFS_PREFIX = "fs.azure."
Expand Down Expand Up @@ -487,6 +489,7 @@ object GlutenConfig extends ConfigRegistry {
SPARK_S3_RETRY_MAX_ATTEMPTS,
SPARK_S3_CONNECTION_MAXIMUM,
SPARK_S3_ENDPOINT_REGION,
SPARK_S3_AWS_IMDS_ENABLED,
"spark.gluten.velox.fs.s3a.connect.timeout",
"spark.gluten.velox.fs.s3a.retry.mode",
"spark.gluten.velox.awsSdkLogLevel",
Expand Down
Loading