Skip to content

Master add conditions to status of custom resource. #80

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

Merged
merged 13 commits into from
Nov 15, 2020
Merged

Master add conditions to status of custom resource. #80

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c59c47d
Added conditions to AppWrapper CRD.
dmatch01 Nov 12, 2020
9de4206
Reduced repeating conditions and coded reason for condition instead o…
dmatch01 Nov 13, 2020
6174473
Debugging statements.
dmatch01 Nov 13, 2020
d9450fa
Debugging statements.
dmatch01 Nov 13, 2020
1bd9095
Debugging statements.
dmatch01 Nov 13, 2020
0380c5c
Debugging statements.
dmatch01 Nov 13, 2020
a474ab5
Added additional debugging.
dmatch01 Nov 14, 2020
2d54f9b
Added additional debugging.
dmatch01 Nov 14, 2020
e5f3f76
Added additional debugging.
dmatch01 Nov 14, 2020
be348f0
Added additional debugging.
dmatch01 Nov 14, 2020
dc865d6
Added additional debugging.
dmatch01 Nov 14, 2020
4365053
Added additional debugging.
dmatch01 Nov 15, 2020
810e06e
Removedadditional debugging.
dmatch01 Nov 15, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Debugging statements. 
Signed-off-by: Diana Arroyo <darroyo@us.ibm.com>
  • Loading branch information
@dmatch01
dmatch01 committed Nov 13, 2020
commit 0380c5c5baf27bede79d1cb65928587f16d4ef7c
15 changes: 13 additions & 2 deletions pkg/controller/queuejob/queuejob_controller_ex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,9 @@ func (cc *XController) updateQueueJob(oldObj, newObj interface{}) {
return
}
oldQJ, ok := oldObj.(*arbv1.AppWrapper)
if (newQJ.Name == "aw-deployment-2-900cpu") {
glog.V(3).Infof("[Informer-updateQJ] %s arrival", newQJ.Name)
}
if !ok {
glog.Errorf("[Informer-updateQJ] old object is not AppWrapper. enqueue(newQJ). oldObj=%+v", oldObj)
glog.V(4).Infof("[Informer-updateQJ] %s *Delay=%.6f seconds BadOldObject enqueue &newQJ=%p Version=%s Status=%+v", newQJ.Name, time.Now().Sub(newQJ.Status.ControllerFirstTimestamp.Time).Seconds(), newQJ, newQJ.ResourceVersion, newQJ.Status)
Expand All @@ -930,8 +933,10 @@ func (cc *XController) updateQueueJob(oldObj, newObj interface{}) {
if (oldQJ.Name == newQJ.Name) && (larger(oldQJ.ResourceVersion, newQJ.ResourceVersion)) {
glog.V(10).Infof("[Informer-updateQJ] %s ignored OutOfOrder arrival &oldQJ=%p oldQJ=%+v", oldQJ.Name, oldQJ, oldQJ)
glog.V(10).Infof("[Informer-updateQJ] %s ignored OutOfOrder arrival &newQJ=%p newQJ=%+v", newQJ.Name, newQJ, newQJ)
glog.V(3).Infof("[Informer-updateQJ] %s ignore OutOfOrder arrival &oldQJ=%p oldQJ=%+v", oldQJ.Name, oldQJ, oldQJ)
glog.V(3).Infof("[Informer-updateQJ] i%s gnore OutOfOrder arrival &newQJ=%p newQJ=%+v", newQJ.Name, newQJ, newQJ)
if (newQJ.Name == "aw-deployment-2-900cpu") {
glog.V(3).Infof("[Informer-updateQJ] %s ignore OutOfOrder arrival &oldQJ=%p oldQJ=%+v", oldQJ.Name, oldQJ, oldQJ)
glog.V(3).Infof("[Informer-updateQJ] i%s gnore OutOfOrder arrival &newQJ=%p newQJ=%+v", newQJ.Name, newQJ, newQJ)
}
return
}
glog.V(3).Infof("[Informer-updateQJ] %s *Delay=%.6f seconds normal enqueue &newQJ=%p Version=%s Status=%+v", newQJ.Name, time.Now().Sub(newQJ.Status.ControllerFirstTimestamp.Time).Seconds(), newQJ, newQJ.ResourceVersion, newQJ.Status)
Expand Down Expand Up @@ -962,6 +967,9 @@ func (cc *XController) enqueue(obj interface{}) {
return
}

if (qj.Name == "aw-deployment-2-900cpu") {
glog.V(3).Infof("[enqueue] %s eventQueue.Add_byEnqueue &qj=%p Version=%s Status=%+v aw=%v", qj.Name, qj, qj.ResourceVersion, qj.Status, qj)
}
err := cc.eventQueue.Add(qj) // add to FIFO queue if not in, update object & keep position if already in FIFO queue
if err != nil {
glog.Errorf("[enqueue] Fail to enqueue %s to eventQueue, ignore. *Delay=%.6f seconds &qj=%p Version=%s Status=%+v err=%#v", qj.Name, time.Now().Sub(qj.Status.ControllerFirstTimestamp.Time).Seconds(), qj, qj.ResourceVersion, qj.Status, err)
Expand Down Expand Up @@ -1168,6 +1176,9 @@ func (cc *XController) manageQueueJob(qj *arbv1.AppWrapper) error {
if err = cc.qjqueue.AddIfNotPresent(qj); err != nil {
glog.Errorf("[worker-manageQJ] Fail to add %s to activeQueue. Back to eventQueue activeQ=%t Unsched=%t &qj=%p Version=%s Status=%+v err=%#v",
qj.Name, cc.qjqueue.IfExistActiveQ(qj), cc.qjqueue.IfExistUnschedulableQ(qj), qj, qj.ResourceVersion, qj.Status, err)
if (qj.Name == "aw-deployment-2-900cpu") {
glog.V(3).Infof("[worker-manageQJ] %s eventQueue.Add_byEnqueue &qj=%p Version=%s Status=%+v aw=%+v", qj.Name, qj, qj.ResourceVersion, qj.Status, qj)
}
cc.enqueue(qj)
} else {
glog.V(3).Infof("[worker-manageQJ] %s 1Delay=%.6f seconds activeQ.Add_success activeQ=%t Unsched=%t &qj=%p Version=%s Status=%+v",
Expand Down