This is an automated email from the ASF dual-hosted git repository.
mani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-core.git
The following commit(s) were added to refs/heads/master by this push:
new 0ffd1392 [YUNIKORN-1863] remove unused code (#590)
0ffd1392 is described below
commit 0ffd1392c329b185bdd8e51665d48e0502807892
Author: Frank Yang <yangp...@gmail.com>
AuthorDate: Thu Jul 13 12:32:10 2023 +0530
[YUNIKORN-1863] remove unused code (#590)
Signed-off-by: Frank Yang <yangp...@gmail.com>
Closes: #590
Signed-off-by: Manikandan R <maniraj...@gmail.com>
---
pkg/scheduler/ugm/manager.go | 48 ++++++--------------------------------------
1 file changed, 6 insertions(+), 42 deletions(-)
diff --git a/pkg/scheduler/ugm/manager.go b/pkg/scheduler/ugm/manager.go
index 3d5f1001..5163c03e 100644
--- a/pkg/scheduler/ugm/manager.go
+++ b/pkg/scheduler/ugm/manager.go
@@ -381,54 +381,18 @@ func (m *Manager) internalProcessConfig(cur
configs.QueueConfig, queuePath strin
}
func (m *Manager) processUserConfig(user string, limitConfig *LimitConfig,
queuePath string, userLimits map[string]bool) error {
- if user == "*" {
- // traverse all tracked users
- for u, ut := range m.userTrackers {
- // Is this user already tracked for the queue path?
- if ut.IsQueuePathTrackedCompletely(queuePath) {
- log.Log(log.SchedUGM).Debug("Processing wild
card user limits configuration for all existing users",
- zap.String("user", u),
- zap.String("queue path", queuePath),
- zap.Uint64("max application",
limitConfig.maxApplications),
- zap.Any("max resources",
limitConfig.maxResources))
- if err := m.setUserLimits(u, limitConfig,
queuePath); err != nil {
- return err
- }
- userLimits[u] = true
- }
- }
- } else if user != "" {
- if err := m.setUserLimits(user, limitConfig, queuePath); err !=
nil {
- return err
- }
- userLimits[user] = true
+ if err := m.setUserLimits(user, limitConfig, queuePath); err != nil {
+ return err
}
+ userLimits[user] = true
return nil
}
func (m *Manager) processGroupConfig(group string, limitConfig *LimitConfig,
queuePath string, groupLimits map[string]bool) error {
- if group == "*" {
- // traverse all tracked groups
- for g, gt := range m.groupTrackers {
- // Is this group already tracked for the queue path?
- if gt.IsQueuePathTrackedCompletely(queuePath) {
- log.Log(log.SchedUGM).Debug("Processing wild
card user limits configuration for all existing groups",
- zap.String("group", g),
- zap.String("queue path", queuePath),
- zap.Uint64("max application",
limitConfig.maxApplications),
- zap.Any("max resources",
limitConfig.maxResources))
- if err := m.setGroupLimits(g, limitConfig,
queuePath); err != nil {
- return err
- }
- groupLimits[g] = true
- }
- }
- } else if group != "" {
- if err := m.setGroupLimits(group, limitConfig, queuePath); err
!= nil {
- return err
- }
- groupLimits[group] = true
+ if err := m.setGroupLimits(group, limitConfig, queuePath); err != nil {
+ return err
}
+ groupLimits[group] = true
return nil
}
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@yunikorn.apache.org
For additional commands, e-mail: issues-h...@yunikorn.apache.org
