This is an automated email from the ASF dual-hosted git repository.
pbacsko 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 358e3b43 [YUNIKORN-2059] Fix the debug-level log of wild card quota
exceeded is always false (#683)
358e3b43 is described below
commit 358e3b43992f2079b2d1867cd33f84cbd846187f
Author: brandboat <[email protected]>
AuthorDate: Thu Oct 26 14:39:28 2023 +0200
[YUNIKORN-2059] Fix the debug-level log of wild card quota exceeded is
always false (#683)
Closes: #683
Signed-off-by: Peter Bacsko <[email protected]>
---
pkg/scheduler/ugm/queue_tracker.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/scheduler/ugm/queue_tracker.go
b/pkg/scheduler/ugm/queue_tracker.go
index 9534cbde..deef4a74 100644
--- a/pkg/scheduler/ugm/queue_tracker.go
+++ b/pkg/scheduler/ugm/queue_tracker.go
@@ -126,6 +126,8 @@ func (qt *QueueTracker) increaseTrackedResource(hierarchy
[]string, applicationI
config = m.getGroupWildCardLimitsConfig(qt.queuePath)
}
if config != nil {
+ wildCardQuotaExceeded = (config.maxApplications != 0 &&
!existingApp && len(qt.runningApplications)+1 > int(config.maxApplications)) ||
+ (!resources.Equals(resources.NewResource(),
config.maxResources) && resources.StrictlyGreaterThan(finalResourceUsage,
config.maxResources))
log.Log(log.SchedUGM).Debug("applying enforcement
checks using limit settings of wild card user/group",
zap.Int("tracking type", int(trackType)),
zap.String("queue path", qt.queuePath),
@@ -133,8 +135,6 @@ func (qt *QueueTracker) increaseTrackedResource(hierarchy
[]string, applicationI
zap.Uint64("wild card max running apps",
config.maxApplications),
zap.Stringer("wild card max resources",
config.maxResources),
zap.Bool("wild card quota exceeded",
wildCardQuotaExceeded))
- wildCardQuotaExceeded = (config.maxApplications != 0 &&
!existingApp && len(qt.runningApplications)+1 > int(config.maxApplications)) ||
- (!resources.Equals(resources.NewResource(),
config.maxResources) && resources.StrictlyGreaterThan(finalResourceUsage,
config.maxResources))
if wildCardQuotaExceeded {
log.Log(log.SchedUGM).Warn("Unable to increase
resource usage as allowing new application to run would exceed either
configured max applications or max resources limit of wild card user/group",
zap.Int("tracking type",
int(trackType)),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
