Merge pull request #4768 from weaviate/correct-idx-add-concurrency-pr…

…operties

errgroup wait correction on idx add property

adapters/repos/db/index.go

@@ -422,11 +422,12 @@ func (i *Index) addProperty(ctx context.Context, props ...*models.Property) erro
 
 	i.ForEachShard(func(key string, shard ShardLike) error {
 		shard.createPropertyIndex(ctx, eg, props...)
-		if err := eg.Wait(); err != nil {
-			return errors.Wrapf(err, "extend idx '%s' with properties '%v", i.ID(), props)
-		}
 		return nil
 	})
+
+	if err := eg.Wait(); err != nil {
+		return errors.Wrapf(err, "extend idx '%s' with properties '%v", i.ID(), props)
+	}
 	return nil
 }
 

adapters/repos/db/shard.go

@@ -754,7 +754,6 @@ func (s *Shard) createPropertyIndex(ctx context.Context, eg *enterrors.ErrorGrou
 					return nil
 				})
 			}
-
 			return nil
 		})
 

usecases/schema/executor.go

@@ -20,7 +20,6 @@ import (
 	"github.com/weaviate/weaviate/cluster/proto/api"
 	"github.com/weaviate/weaviate/entities/models"
 	"github.com/weaviate/weaviate/entities/schema"
-	schemaConfig "github.com/weaviate/weaviate/entities/schema/config"
 )
 
 type executor struct {
@@ -91,7 +90,7 @@ func (e *executor) UpdateClass(req api.UpdateClassRequest) error {
 		}
 	} else {
 		if err := e.migrator.UpdateVectorIndexConfig(ctx,
-			className, req.Class.VectorIndexConfig.(schemaConfig.VectorIndexConfig)); err != nil {
+			className, asVectorIndexConfig(req.Class)); err != nil {
 			return fmt.Errorf("vector index config update: %w", err)
 		}
 	}

usecases/schema/parser.go

@@ -264,6 +264,15 @@ func asVectorIndexConfigs(c *models.Class) map[string]schemaConfig.VectorIndexCo
 	return cfgs
 }
 
+func asVectorIndexConfig(c *models.Class) schemaConfig.VectorIndexConfig {
+	validCfg, ok := c.VectorIndexConfig.(schemaConfig.VectorIndexConfig)
+	if !ok {
+		return nil
+	}
+
+	return validCfg
+}
+
 func validateShardingConfig(current, update *models.Class, mtEnabled bool) error {
 	if mtEnabled {
 		return nil