Skip to content

Commit f21ff9d

Browse files
committed
deployments: fix concurrent map read write race (#294)
Signed-off-by: haorenfsa <shaoyue.chen@zilliz.com>
1 parent 3707210 commit f21ff9d

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

pkg/controllers/deployments.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,23 +208,26 @@ func (r *MilvusReconciler) RemoveOldStandlone(ctx context.Context, mc v1beta1.Mi
208208
}
209209

210210
func (r *MilvusReconciler) ReconcileDeployments(ctx context.Context, mc v1beta1.Milvus) error {
211-
g, gtx := NewGroup(ctx)
212211
err := r.RemoveOldStandlone(ctx, mc)
213212
if err != nil {
214213
return err
215214
}
215+
var errs = []error{}
216216
for _, component := range GetComponentsBySpec(mc.Spec) {
217217
switch {
218218
case component == QueryNode ||
219219
mc.Spec.Com.RollingMode == v1beta1.RollingModeV3:
220-
g.Go(WarppedReconcileComponentFunc(r.deployCtrl.Reconcile, gtx, mc, component))
220+
err = r.deployCtrl.Reconcile(ctx, mc, component)
221221
default:
222-
g.Go(WarppedReconcileComponentFunc(r.ReconcileComponentDeployment, gtx, mc, component))
222+
err = r.ReconcileComponentDeployment(ctx, mc, component)
223+
}
224+
if err != nil {
225+
errs = append(errs, err)
223226
}
224227
}
225228

226-
if err := g.Wait(); err != nil {
227-
return fmt.Errorf("reconcile milvus deployments: %w", err)
229+
if len(errs) > 0 {
230+
return fmt.Errorf("reconcile milvus deployments errs: %w", err)
228231
}
229232

230233
return nil

0 commit comments

Comments
 (0)