ByteYue commented on code in PR #38685:
URL: https://github.com/apache/doris/pull/38685#discussion_r1709054876
##########
cloud/src/meta-service/meta_service_resource.cpp:
##########
@@ -510,13 +510,115 @@ static void set_default_vault_log_helper(const
InstanceInfoPB& instance,
LOG(INFO) << vault_msg;
}
+static int alter_hdfs_storage_vault(InstanceInfoPB& instance,
std::unique_ptr<Transaction> txn,
+ const StorageVaultPB& vault,
MetaServiceCode& code,
+ std::string& msg) {
+ if (!vault.has_hdfs_info()) {
+ code = MetaServiceCode::INVALID_ARGUMENT;
+ std::stringstream ss;
+ ss << "There is no hdfs vault provided";
+ msg = ss.str();
+ return -1;
+ }
+ const auto& hdfs_info = vault.hdfs_info();
+ if (hdfs_info.has_prefix() || !hdfs_info.has_build_conf() ||
+ hdfs_info.build_conf().has_fs_name()) {
+ code = MetaServiceCode::INVALID_ARGUMENT;
+ std::stringstream ss;
+ ss << "You can not alter prefix or fs name";
+ msg = ss.str();
+ return -1;
+ }
+ const auto& name = vault.name();
+ // Here we try to get mutable iter since we might need to alter the vault
name
+ auto name_itr =
std::find_if(instance.mutable_storage_vault_names()->begin(),
+ instance.mutable_storage_vault_names()->end(),
+ [&](const auto& vault_name) { return name ==
vault_name; });
+ if (name_itr == instance.storage_vault_names().end()) {
+ code = MetaServiceCode::INVALID_ARGUMENT;
+ std::stringstream ss;
+ ss << "invalid storage vault name, not found, name =" << name;
+ msg = ss.str();
+ return -1;
+ }
+ auto pos = name_itr - instance.storage_vault_names().begin();
+ auto id_itr = instance.resource_ids().begin() + pos;
+ auto vault_key = storage_vault_key({instance.instance_id(), *id_itr});
+ std::string val;
+
+ auto err = txn->get(vault_key, &val);
+ LOG(INFO) << "get instance_key=" << hex(vault_key);
+
+ if (err != TxnErrorCode::TXN_OK) {
+ code = cast_as<ErrCategory::READ>(err);
+ std::stringstream ss;
+ ss << "failed to get storage vault, vault_id=" << *name_itr << ",
vault_name="
+ << "" << name << " err=" << err;
+ msg = ss.str();
+ return -1;
+ }
+ StorageVaultPB alter;
+ alter.ParseFromString(val);
+ if (vault.has_alter_name()) {
+ alter.set_name(vault.alter_name());
+ *name_itr = vault.alter_name();
+ }
+ std::stringstream log_msg;
+ auto* alter_hdfs_info = alter.mutable_hdfs_info();
+ if (hdfs_info.build_conf().has_hdfs_kerberos_keytab()) {
+ log_msg << " set kerberos key tab from "
+ << alter_hdfs_info->build_conf().hdfs_kerberos_keytab() << "
to "
+ << hdfs_info.build_conf().hdfs_kerberos_keytab();
+ alter_hdfs_info->mutable_build_conf()->set_hdfs_kerberos_keytab(
+ hdfs_info.build_conf().hdfs_kerberos_keytab());
+ }
+ if (hdfs_info.build_conf().has_hdfs_kerberos_principal()) {
+ log_msg << " set kerberos principal from "
+ << alter_hdfs_info->build_conf().hdfs_kerberos_principal() <<
" to "
+ << hdfs_info.build_conf().hdfs_kerberos_principal();
+ alter_hdfs_info->mutable_build_conf()->set_hdfs_kerberos_principal(
+ hdfs_info.build_conf().hdfs_kerberos_principal());
+ }
+ if (hdfs_info.build_conf().has_user()) {
+ log_msg << " set user from " << alter_hdfs_info->build_conf().user()
<< " to "
+ << hdfs_info.build_conf().user();
+
alter_hdfs_info->mutable_build_conf()->set_user(hdfs_info.build_conf().user());
+ }
+ if (0 != hdfs_info.build_conf().hdfs_confs_size()) {
+ for (const auto& conf : hdfs_info.build_conf().hdfs_confs()) {
+ log_msg << " add hdfs conf key " << conf.key() << " value " <<
conf.value();
+ }
+ alter_hdfs_info->mutable_build_conf()->mutable_hdfs_confs()->Add(
+ hdfs_info.build_conf().hdfs_confs().begin(),
+ hdfs_info.build_conf().hdfs_confs().end());
+ }
+
+ val = alter.SerializeAsString();
+ if (val.empty()) {
+ msg = "failed to serialize";
+ code = MetaServiceCode::PROTOBUF_SERIALIZE_ERR;
+ return -1;
+ }
+
+ txn->put(vault_key, val);
Review Comment:
The log_msg contains all the related property.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
