Skip to content

Commit 414cb99

Browse files
authored
Merge pull request #6554 from NickYadance/sync-searchcache-before-start
Synchronize search cache before starting Karmada search controller
2 parents 7eafdfd + 9ba4d2f commit 414cb99

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cmd/karmada-search/app/karmada-search.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,11 @@ func run(ctx context.Context, o *options.Options, registryOptions ...Option) err
141141
return nil
142142
})
143143

144+
karmadaSharedInformerFactoryCacheSynced := make(chan struct{})
144145
server.GenericAPIServer.AddPostStartHookOrDie("start-karmada-informers", func(context genericapiserver.PostStartHookContext) error {
145146
config.ExtraConfig.KarmadaSharedInformerFactory.Start(context.Done())
147+
config.ExtraConfig.KarmadaSharedInformerFactory.WaitForCacheSync(context.Done())
148+
close(karmadaSharedInformerFactoryCacheSynced)
146149
return nil
147150
})
148151

@@ -151,6 +154,7 @@ func run(ctx context.Context, o *options.Options, registryOptions ...Option) err
151154
if config.ExtraConfig.Controller != nil {
152155
server.GenericAPIServer.AddPostStartHookOrDie("start-karmada-search-controller", func(context genericapiserver.PostStartHookContext) error {
153156
// start ResourceRegistry controller
157+
<-karmadaSharedInformerFactoryCacheSynced
154158
config.ExtraConfig.Controller.Start(context)
155159
return nil
156160
})

pkg/search/controller.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ func (c *Controller) Start(ctx context.Context) {
134134

135135
defer runtime.HandleCrash()
136136

137-
c.informerFactory.WaitForCacheSync(ctx.Done())
138-
139137
go wait.Until(c.worker, time.Second, ctx.Done())
140138

141139
go func() {

0 commit comments

Comments
 (0)