github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broadcaster duplicate

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2015-11-04 11:35:26 +01:00
parent 182f49dac5
commit a727188c19
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/pkg/scheduler/components/scheduler.go
View File

@@ -80,10 +80,8 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
binder := binder.NewBinder(core) binder := binder.NewBinder(core)
startLatch := make(chan struct{}) startLatch := make(chan struct{})
eventBroadcaster := record.NewBroadcaster()
runtime.On(startLatch, func() { runtime.On(startLatch, func() {
eventBroadcaster.StartRecordingToSink(client.Events(""))
reflector.Run() // TODO(jdef) should listen for termination reflector.Run() // TODO(jdef) should listen for termination
podDeleter.Run(updates, terminate) podDeleter.Run(updates, terminate)
q.Run(terminate) q.Run(terminate)

7
contrib/mesos/pkg/scheduler/service/service.go
View File

@@ -759,9 +759,12 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config
}, },
} }
// create event recorder sending events to the "" namespace of the apiserver
broadcaster := record.NewBroadcaster()
recorder := broadcaster.NewRecorder(api.EventSource{Component: "scheduler"})
broadcaster.StartRecordingToSink(client.Events(""))
// create scheduler loop // create scheduler loop
eventBroadcaster := record.NewBroadcaster()
recorder := eventBroadcaster.NewRecorder(api.EventSource{Component: "scheduler"})
lw := cache.NewListWatchFromClient(client, "pods", api.NamespaceAll, fields.Everything()) lw := cache.NewListWatchFromClient(client, "pods", api.NamespaceAll, fields.Everything())
sched := components.NewScheduler(sc, framework, fcfs, client, recorder, schedulerProcess.Terminal(), s.mux, lw) sched := components.NewScheduler(sc, framework, fcfs, client, recorder, schedulerProcess.Terminal(), s.mux, lw)