Skip to content
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

Jump to bottom

Added Log output for LocalQueue and ClusterQueue #3605

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Added Log output for LocalQueue and ClusterQueue #3605

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4df8fe
Added Log output for LocalQueue and ClusterQueue
7h3-3mp7y-m4n Nov 20, 2024
fa8c077
Added changes
7h3-3mp7y-m4n Nov 21, 2024
fd7bc6a
added println
7h3-3mp7y-m4n Nov 21, 2024
c77a3a1
updated the log output using default error
7h3-3mp7y-m4n Nov 26, 2024
449e24e
Added test case
7h3-3mp7y-m4n Nov 27, 2024
84d415a
Added changes
7h3-3mp7y-m4n Nov 27, 2024
27af647
Adding return statements for ci-lint
7h3-3mp7y-m4n Nov 29, 2024
bf0d9e4
removed comments
7h3-3mp7y-m4n Nov 29, 2024
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: 15 additions & 11 deletions pkg/controller/core/workload_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,8 +599,9 @@ func (r *WorkloadReconciler) Create(e event.CreateEvent) bool {
workload.AdjustResources(ctx, r.client, wlCopy)

if !workload.HasQuotaReservation(wl) {
if !r.queues.AddOrUpdateWorkload(wlCopy) {
log.V(2).Info("LocalQueue for workload didn't exist or not active; ignored for now")
err := r.queues.AddOrUpdateWorkload(wlCopy)
if err != nil {
log.V(2).Info(err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log.V(2).Info(err.Error())
log.V(2).Info(fmt.Sprintf("%s; ignored for now", err))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To have the same message.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for sure I'll add them :)

}
return true
}
Expand Down Expand Up @@ -703,10 +704,10 @@ func (r *WorkloadReconciler) Update(e event.UpdateEvent) bool {
})

case prevStatus == workload.StatusPending && status == workload.StatusPending:
if !r.queues.UpdateWorkload(oldWl, wlCopy) {
log.V(2).Info("Queue for updated workload didn't exist; ignoring for now")
err := r.queues.UpdateWorkload(oldWl, wlCopy)
if err != nil {
log.V(2).Info(err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log.V(2).Info(err.Error())
log.V(2).Info(fmt.Sprintf("%s; ignored for now", err))

}

case prevStatus == workload.StatusPending && (status == workload.StatusQuotaReserved || status == workload.StatusAdmitted):
r.queues.DeleteWorkload(oldWl)
if !r.cache.AddOrUpdateWorkload(wlCopy) {
Expand All @@ -729,8 +730,9 @@ func (r *WorkloadReconciler) Update(e event.UpdateEvent) bool {
// Here we don't take the lock as it is already taken by the wrapping
// function.
if immediate {
if !r.queues.AddOrUpdateWorkloadWithoutLock(wlCopy) {
log.V(2).Info("LocalQueue for workload didn't exist or not active; ignored for now")
err := r.queues.AddOrUpdateWorkloadWithoutLock(wlCopy)
if err != nil {
log.V(2).Info(err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log.V(2).Info(err.Error())
log.V(2).Info(fmt.Sprintf("%s; ignored for now", err))

}
}
})
Expand All @@ -741,8 +743,9 @@ func (r *WorkloadReconciler) Update(e event.UpdateEvent) bool {
updatedWl := kueue.Workload{}
err := r.client.Get(ctx, client.ObjectKeyFromObject(wl), &updatedWl)
if err == nil && workload.Status(&updatedWl) == workload.StatusPending {
if !r.queues.AddOrUpdateWorkload(wlCopy) {
log.V(2).Info("LocalQueue for workload didn't exist or not active; ignored for now")
err := r.queues.AddOrUpdateWorkload(wlCopy)
if err != nil {
log.V(2).Info(err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log.V(2).Info(err.Error())
log.V(2).Info(fmt.Sprintf("%s; ignored for now", err))

} else {
log.V(3).Info("Workload requeued after backoff")
}
Expand Down Expand Up @@ -886,8 +889,9 @@ func (h *resourceUpdatesHandler) queueReconcileForPending(ctx context.Context, _
log := log.WithValues("workload", klog.KObj(wlCopy))
log.V(5).Info("Queue reconcile for")
workload.AdjustResources(ctrl.LoggerInto(ctx, log), h.r.client, wlCopy)
if !h.r.queues.AddOrUpdateWorkload(wlCopy) {
log.V(2).Info("Queue for workload didn't exist")
err := h.r.queues.AddOrUpdateWorkload(wlCopy)
if err != nil {
log.V(2).Info(err.Error())
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/queue/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,28 +319,28 @@ func (m *Manager) ClusterQueueForWorkload(wl *kueue.Workload) (string, bool) {

// AddOrUpdateWorkload adds or updates workload to the corresponding queue.
// Returns whether the queue existed.
func (m *Manager) AddOrUpdateWorkload(w *kueue.Workload) bool {
func (m *Manager) AddOrUpdateWorkload(w *kueue.Workload) error {
m.Lock()
defer m.Unlock()
return m.AddOrUpdateWorkloadWithoutLock(w)
}

func (m *Manager) AddOrUpdateWorkloadWithoutLock(w *kueue.Workload) bool {
func (m *Manager) AddOrUpdateWorkloadWithoutLock(w *kueue.Workload) error {
qKey := workload.QueueKey(w)
q := m.localQueues[qKey]
if q == nil {
return false
return ErrQueueDoesNotExist
}
wInfo := workload.NewInfo(w, m.workloadInfoOptions...)
q.AddOrUpdate(wInfo)
cq := m.hm.ClusterQueues[q.ClusterQueue]
if cq == nil {
return false
return errClusterQueueAlreadyExists
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return errClusterQueueAlreadyExists
return ErrClusterQueueDoesNotExist

}
cq.PushOrUpdate(wInfo)
m.reportPendingWorkloads(q.ClusterQueue, cq)
m.Broadcast()
return true
return nil
}

// RequeueWorkload requeues the workload ensuring that the queue and the
Expand Down Expand Up @@ -503,7 +503,7 @@ func requeueWorkloadsCohortSubtree(ctx context.Context, m *Manager, cohort *coho

// UpdateWorkload updates the workload to the corresponding queue or adds it if
// it didn't exist. Returns whether the queue existed.
func (m *Manager) UpdateWorkload(oldW, w *kueue.Workload) bool {
func (m *Manager) UpdateWorkload(oldW, w *kueue.Workload) error {
m.Lock()
defer m.Unlock()
if oldW.Spec.QueueName != w.Spec.QueueName {
Expand Down