Skip to content

[GLUTEN-1897][CH] Respect hdfs-site.xml configs for clickhouse libhdfs3 #1900

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jun 14, 2023
Merged

[GLUTEN-1897][CH] Respect hdfs-site.xml configs for clickhouse libhdfs3 #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e24e896
respect hdfs-site.xml configs in libhdfs3
taiyang-li Jun 9, 2023
3f9e88a
enable logging of libhdfs3
taiyang-li Jun 9, 2023
1860db3
fix bugs
taiyang-li Jun 9, 2023
b593ba9
remove comment
taiyang-li Jun 14, 2023
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
15 changes: 14 additions & 1 deletion ...-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHTransformerApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ class CHTransformerApi extends TransformerApi with Logging {
override def postProcessNativeConfig(
nativeConfMap: util.Map[String, String],
backendPrefix: String): Unit = {
// IMPLEMENT POST PROCESS FOR CLICKHOUSE BACKEND
val settingPrefix = backendPrefix + ".runtime_settings."
if (nativeConfMap.getOrDefault("spark.memory.offHeap.enabled", "false").toBoolean) {
val offHeapSize =
Expand All @@ -120,5 +119,19 @@ class CHTransformerApi extends TransformerApi with Logging {
maxBytesBeforeExternalGroupBy.toLong.toString)
}
}

val injectConfig: (String, String) => Unit = (srcKey, dstKey) => {
if (nativeConfMap.containsKey(srcKey)) {
nativeConfMap.put(dstKey, nativeConfMap.get(srcKey))
}
}

val hdfsConfigPrefix = backendPrefix + ".runtime_config.hdfs."
injectConfig("spark.hadoop.input.connect.timeout", hdfsConfigPrefix + "input_connect_timeout")
injectConfig("spark.hadoop.input.read.timeout", hdfsConfigPrefix + "input_read_timeout")
injectConfig("spark.hadoop.input.write.timeout", hdfsConfigPrefix + "input_write_timeout")
injectConfig(
"spark.hadoop.dfs.client.log.severity",
hdfsConfigPrefix + "dfs_client_log_severity")
}
}
4 changes: 4 additions & 0 deletions cpp-ch/local-engine/Common/CHUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ void BackendInitializerUtil::initConfig(std::string * plan)
{
const auto & key = kv.first;
const auto & value = kv.second;
// std::cout << "set config key:" << key << ", value:" << value << std::endl;

if (key.starts_with(CH_RUNTIME_CONFIG_PREFIX) && key != CH_RUNTIME_CONFIG_FILE)
config->setString(key.substr(CH_RUNTIME_CONFIG_PREFIX.size()), value);
Expand Down Expand Up @@ -514,6 +515,9 @@ void BackendInitializerUtil::initEnvs()
std::string libhdfs3_conf = config->getString(LIBHDFS3_CONF_KEY, "");
setenv("LIBHDFS3_CONF", libhdfs3_conf.c_str(), true); /// NOLINT
}

/// Enable logging in libhdfs3, logs will be written to stderr
setenv("HDFS_ENABLE_LOGGING", "true", true); /// NOLINT
}

void BackendInitializerUtil::initSettings()
Expand Down
6 changes: 5 additions & 1 deletion shims/common/src/main/scala/io/glutenproject/GlutenConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,11 @@ object GlutenConfig {
COLUMNAR_VELOX_CONNECTOR_IO_THREADS.defaultValueString),
(
COLUMNAR_VELOX_SPLIT_PRELOAD_PER_DRIVER.key,
COLUMNAR_VELOX_SPLIT_PRELOAD_PER_DRIVER.defaultValueString)
COLUMNAR_VELOX_SPLIT_PRELOAD_PER_DRIVER.defaultValueString),
("spark.hadoop.input.connect.timeout", "180000"),
("spark.hadoop.input.read.timeout", "180000"),
("spark.hadoop.input.write.timeout", "180000"),
("spark.hadoop.dfs.client.log.severity", "INFO")
)
keyWithDefault.forEach(e => nativeConfMap.put(e._1, conf.getOrElse(e._1, e._2)))
// velox cache and HiveConnector config
Expand Down