Dev/partition allow accounts #404
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
huerni
commented
Dec 19, 2024
huerni
commented
- config文件partition添加AllowAccounts设置，AllowAccounts=，ctld启动时读取配置。
- 命令行修改partition的AllowAccounts，无需持久化，持久化只能在config文件进行定义。
- ccontrol show partition 添加AllowAccounts条目展示。
- 提交任务时判断account是否在partition的AllowAccounts中
RileyWen
requested changes
Jan 16, 2025
src/CraneCtld/CraneCtld.cpp
Outdated
| std::string allow_accounts_str = | ||
| partition["AllowAccounts"].as<std::string>(); | ||
| std::vector<std::string> allow_accounts = | ||
| absl::StrSplit(allow_accounts_str, ","); |
| @@ -283,9 +283,11 @@ void CranedMetaContainer::InitFromConfig(const Config& config) { | |||
| part_meta.partition_global_meta.res_total_inc_dead = part_res; | |||
| part_meta.partition_global_meta.node_cnt = part_meta.craned_ids.size(); | |||
| part_meta.partition_global_meta.nodelist_str = partition.nodelist_str; | |||
| part_meta.partition_global_meta.allow_accounts = partition.allow_accounts; | |||
| @@ -976,8 +976,7 @@ std::expected<void, std::string> AccountManager::CheckAndApplyQosLimitOnTask( | |||
| return {}; | |||
| } | |||
|
|
|||
| std::expected<void, std::string> AccountManager::CheckUidIsAdmin( | |||
| uint32_t uid) { | |||
| std::expected<void, std::string> AccountManager::CheckUidIsAdmin(uint32_t uid) { | |||
| const std::unordered_set<std::string>& allow_accounts) { | ||
| CraneErrCodeExpected<void> result{}; | ||
|
|
||
| if (!partition_metas_map_.Contains(partition_name)) |
|
|
||
| bool CranedMetaContainer::CheckIfAccountIsAllowedInPartition( | ||
| const std::string& partition_name, const std::string& account_name) { | ||
| if (!partition_metas_map_.Contains(partition_name)) return false; |
src/CraneCtld/CtldGrpcServer.cpp
Outdated
| allow_accounts.insert(account_name); | ||
| } | ||
|
|
||
| result = g_account_manager->CheckModifyPartitionAllowAccounts( |
src/CraneCtld/CtldGrpcServer.cpp
Outdated
| @@ -980,6 +1013,13 @@ CtldServer::SubmitTaskToScheduler(std::unique_ptr<TaskInCtld> task) { | |||
| return std::unexpected(enable_res.error()); | |||
| } | |||
|
|
|||
| if (!g_meta_container->CheckIfAccountIsAllowedInPartition(task->partition_id, | |||
huerni
force-pushed
the
dev/partition_allow_account
branch
from
59671e1 to
e7314d1
Compare
…tition's AllowAccounts.
huerni
force-pushed
the
dev/partition_allow_account
branch
from
e7314d1 to
60d444f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.