Skip to content

Commit 76708bf

Browse files
committed
revert duplicate informer sync logic
1 parent 4a3ddf3 commit 76708bf

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

pkg/controller/queuejob/queuejob_controller_ex.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2151,20 +2151,16 @@ func (cc *XController) Cleanup(ctx context.Context, appwrapper *arbv1.AppWrapper
21512151
}
21522152
func (cc *XController) getAppWrapper(namespace string, name string, caller string) (*arbv1.AppWrapper, error) {
21532153
klog.V(5).Infof("[getAppWrapper] getting a copy of '%s/%s' when called by '%s'.", namespace, name, caller)
2154-
var apiCacheAWJob *arbv1.AppWrapper
2155-
var err error
2156-
if cc.appwrapperInformer.Informer().HasSynced() {
2157-
apiCacheAWJob, err = cc.appWrapperLister.AppWrappers(namespace).Get(name)
2158-
if err != nil {
2159-
if !apierrors.IsNotFound(err) {
2160-
klog.Errorf("[getAppWrapper] getting a copy of '%s/%s' failed, when called by '%s', err=%v", namespace, name, caller, err)
2161-
}
2162-
return nil, err
2154+
2155+
apiCacheAWJob, err := cc.appWrapperLister.AppWrappers(namespace).Get(name)
2156+
if err != nil {
2157+
if !apierrors.IsNotFound(err) {
2158+
klog.Errorf("[getAppWrapper] getting a copy of '%s/%s' failed, when called by '%s', err=%v", namespace, name, caller, err)
21632159
}
2164-
klog.V(5).Infof("[getAppWrapper] get a copy of '%s/%s' suceeded when called by '%s'", namespace, name, caller)
2165-
return apiCacheAWJob.DeepCopy(), nil
2160+
return nil, err
21662161
}
2167-
return nil, errors.New("appwrapper informer has not synced")
2162+
klog.V(5).Infof("[getAppWrapper] get a copy of '%s/%s' suceeded when called by '%s'", namespace, name, caller)
2163+
return apiCacheAWJob.DeepCopy(), nil
21682164
}
21692165

21702166
type EtcdErrorClassifier struct {

0 commit comments

Comments
 (0)