Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/koordlet/resmanager/resmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func NewResManager(cfg *Config, schema *apiruntime.Scheme, kubeClient clientset.

eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartRecordingToSink(&clientcorev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
recorder := eventBroadcaster.NewRecorder(schema, corev1.EventSource{Component: "slo-agent-reporter", Host: nodeName})
recorder := eventBroadcaster.NewRecorder(schema, corev1.EventSource{Component: "koordlet-resmanager", Host: nodeName})

r := &resmanager{
config: cfg,
Expand Down
13 changes: 6 additions & 7 deletions pkg/util/feature.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,17 @@ import (

// RunFeature runs moduleFunc only if interval > 0 AND at least one feature dependency is enabled
func RunFeature(moduleFunc func(), featureDependency []featuregate.Feature, interval int, stopCh <-chan struct{}) bool {
ret, _ := RunFeatureWithInit(func() error { return nil }, moduleFunc, featureDependency, interval, stopCh)
return ret
return RunFeatureWithInit(func() error { return nil }, moduleFunc, featureDependency, interval, stopCh)
}

// RunFeatureWithInit runs moduleFunc only if interval > 0 , at least one feature dependency is enabled
// and moduleInit function returns nil
func RunFeatureWithInit(moduleInit func() error, moduleFunc func(), featureDependency []featuregate.Feature, interval int, stopCh <-chan struct{}) (bool, error) {
func RunFeatureWithInit(moduleInit func() error, moduleFunc func(), featureDependency []featuregate.Feature, interval int, stopCh <-chan struct{}) bool {
moduleInitName := runtime.FuncForPC(reflect.ValueOf(moduleInit).Pointer()).Name()
moduleFuncName := runtime.FuncForPC(reflect.ValueOf(moduleFunc).Pointer()).Name()
if interval <= 0 {
klog.Infof("time interval %v is disabled, skip run %v module", interval, moduleFuncName)
return false, nil
return false
}

moduleFuncEnabled := len(featureDependency) == 0
Expand All @@ -53,16 +52,16 @@ func RunFeatureWithInit(moduleInit func() error, moduleFunc func(), featureDepen
}
if !moduleFuncEnabled {
klog.Infof("all feature dependency %v is disabled, skip run module %v", featureDependency, moduleFuncName)
return false, nil
return false
}

klog.Infof("starting %v feature init module", moduleInitName)
if err := moduleInit(); err != nil {
klog.Errorf("starting %v feature init module error %v", moduleInitName, err)
return false, err
return false
}

klog.Infof("starting %v feature dependency module, interval seconds %v", moduleFuncName, interval)
go wait.Until(moduleFunc, time.Duration(interval)*time.Second, stopCh)
return true, nil
return true
}