Skip to content

Commit

Permalink
Set scheduler event recorder in tests.
Browse files Browse the repository at this point in the history
We accidentally removed the Recorder object from integration test
scheduler in kubernetes#71875. This
caused segfaults when running scheduler benchmarks.

    make test-integration WHAT="./test/integration/scheduler_perf" KUBE_TEST_ARGS="-run xx -bench ."

This change adds the recorder back.
  • Loading branch information
Jonathan Basseri committed Jan 18, 2019
1 parent 5e86fa4 commit ab7c2ea
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions test/integration/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
clientv1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/record"
"k8s.io/klog"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/scheduler"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
"k8s.io/kubernetes/pkg/scheduler/factory"
Expand Down Expand Up @@ -59,10 +60,6 @@ func StartApiserver() (string, ShutdownFunc) {
func StartScheduler(clientSet clientset.Interface) (factory.Configurator, ShutdownFunc) {
informerFactory := informers.NewSharedInformerFactory(clientSet, 0)

evtBroadcaster := record.NewBroadcaster()
evtWatch := evtBroadcaster.StartRecordingToSink(&clientv1core.EventSinkImpl{
Interface: clientSet.CoreV1().Events("")})

stopCh := make(chan struct{})
schedulerConfigurator := createSchedulerConfigurator(clientSet, informerFactory, stopCh)

Expand All @@ -71,6 +68,11 @@ func StartScheduler(clientSet clientset.Interface) (factory.Configurator, Shutdo
klog.Fatalf("Error creating scheduler: %v", err)
}

evtBroadcaster := record.NewBroadcaster()
config.Recorder = evtBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: "scheduler"})
evtWatch := evtBroadcaster.StartRecordingToSink(&clientv1core.EventSinkImpl{
Interface: clientSet.CoreV1().Events("")})

sched := scheduler.NewFromConfig(config)
informerFactory.Start(stopCh)
sched.Run()
Expand Down

0 comments on commit ab7c2ea

Please sign in to comment.