Skip to content

branch-2.1:[fix](libhdfs) fix the lifecycle issue of libhdfs config #48352

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
morningman merged 3 commits into from
Feb 26, 2025
Merged

branch-2.1:[fix](libhdfs) fix the lifecycle issue of libhdfs config #48352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47aaea8
[fix](libhdfs) fix the lifecycle issue of libhdfs config
morningman Feb 26, 2025
1fbbaf8
2
morningman Feb 26, 2025
547f0ae
2
morningman Feb 26, 2025
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
26 changes: 20 additions & 6 deletions be/src/io/hdfs_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ Status HDFSCommonBuilder::init_hdfs_builder() {
return Status::OK();
}

void HDFSCommonBuilder::set_hdfs_conf(const std::string& key, const std::string& val) {
hdfs_conf[key] = val;
}

void HDFSCommonBuilder::set_hdfs_conf_to_hdfs_builder() {
for (const auto& pair : hdfs_conf) {
hdfsBuilderConfSetStr(hdfs_builder, pair.first.c_str(), pair.second.c_str());
}
}

Status HDFSCommonBuilder::check_krb_params() {
std::string ticket_path = doris::config::kerberos_ccache_path;
if (!ticket_path.empty()) {
Expand Down Expand Up @@ -157,22 +167,24 @@ THdfsParams parse_properties(const std::map<std::string, std::string>& propertie
Status create_hdfs_builder(const THdfsParams& hdfsParams, const std::string& fs_name,
HDFSCommonBuilder* builder) {
RETURN_IF_ERROR(builder->init_hdfs_builder());
hdfsBuilderSetNameNode(builder->get(), fs_name.c_str());
builder->fs_name = fs_name;
hdfsBuilderSetNameNode(builder->get(), builder->fs_name.c_str());
// set kerberos conf
if (hdfsParams.__isset.hdfs_kerberos_keytab) {
builder->kerberos_login = true;
builder->hdfs_kerberos_keytab = hdfsParams.hdfs_kerberos_keytab;
#ifdef USE_HADOOP_HDFS
hdfsBuilderSetKerb5Conf(builder->get(), doris::config::kerberos_krb5_conf_path.c_str());
hdfsBuilderSetKeyTabFile(builder->get(), hdfsParams.hdfs_kerberos_keytab.c_str());
hdfsBuilderSetKeyTabFile(builder->get(), builder->hdfs_kerberos_keytab.c_str());
#endif
}
if (hdfsParams.__isset.hdfs_kerberos_principal) {
builder->kerberos_login = true;
builder->hdfs_kerberos_principal = hdfsParams.hdfs_kerberos_principal;
hdfsBuilderSetPrincipal(builder->get(), hdfsParams.hdfs_kerberos_principal.c_str());
hdfsBuilderSetPrincipal(builder->get(), builder->hdfs_kerberos_principal.c_str());
} else if (hdfsParams.__isset.user) {
hdfsBuilderSetUserName(builder->get(), hdfsParams.user.c_str());
builder->hadoop_user = hdfsParams.user;
hdfsBuilderSetUserName(builder->get(), builder->hadoop_user.c_str());
#ifdef USE_HADOOP_HDFS
hdfsBuilderSetKerb5Conf(builder->get(), nullptr);
hdfsBuilderSetKeyTabFile(builder->get(), nullptr);
Expand All @@ -181,15 +193,17 @@ Status create_hdfs_builder(const THdfsParams& hdfsParams, const std::string& fs_
// set other conf
if (hdfsParams.__isset.hdfs_conf) {
for (const THdfsConf& conf : hdfsParams.hdfs_conf) {
hdfsBuilderConfSetStr(builder->get(), conf.key.c_str(), conf.value.c_str());
builder->set_hdfs_conf(conf.key, conf.value);
LOG(INFO) << "set hdfs config: " << conf.key << ", value: " << conf.value;
#ifdef USE_HADOOP_HDFS
// Set krb5.conf, we should define java.security.krb5.conf in catalog properties
if (strcmp(conf.key.c_str(), "java.security.krb5.conf") == 0) {
hdfsBuilderSetKerb5Conf(builder->get(), conf.value.c_str());
builder->krb5_conf_path = conf.value;
hdfsBuilderSetKerb5Conf(builder->get(), builder->krb5_conf_path.c_str());
}
#endif
}
builder->set_hdfs_conf_to_hdfs_builder();
}
if (builder->is_kerberos()) {
RETURN_IF_ERROR(builder->check_krb_params());
Expand Down
7 changes: 7 additions & 0 deletions be/src/io/hdfs_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,18 @@ class HDFSCommonBuilder {
bool is_kerberos() const { return kerberos_login; }
Status check_krb_params();

void set_hdfs_conf(const std::string& key, const std::string& val);
void set_hdfs_conf_to_hdfs_builder();

private:
hdfsBuilder* hdfs_builder = nullptr;
bool kerberos_login {false};
std::string fs_name;
std::string hadoop_user;
std::string hdfs_kerberos_keytab;
std::string hdfs_kerberos_principal;
std::string krb5_conf_path;
std::unordered_map<std::string, std::string> hdfs_conf;
};

THdfsParams parse_properties(const std::map<std::string, std::string>& properties);
Expand Down
Loading