You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2023/08/11 00:51:37 UTC
[skywalking-banyandb] branch node-role created (now c5bafd5f)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch node-role
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
at c5bafd5f Implement node role registration
This branch includes the following new commits:
new c5bafd5f Implement node role registration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-banyandb] 01/01: Implement node role registration
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch node-role
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
commit c5bafd5f5ca25714791b1f3c11d88c403a8728db
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Aug 10 06:18:23 2023 +0000
Implement node role registration
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
CHANGES.md | 1 +
api/common/id.go | 44 +++++++++
api/proto/banyandb/database/v1/database.proto | 33 +++++--
api/proto/banyandb/database/v1/event.proto | 50 ----------
banyand/internal/cmd/liaison.go | 7 +-
banyand/internal/cmd/meta.go | 11 ++-
banyand/internal/cmd/root.go | 2 +
banyand/internal/cmd/standalone.go | 11 ++-
banyand/internal/cmd/storage.go | 11 ++-
banyand/liaison/grpc/discovery.go | 18 ++--
banyand/liaison/grpc/registry_test.go | 4 +-
banyand/liaison/grpc/server.go | 4 +-
banyand/liaison/http/server.go | 2 +-
banyand/measure/measure_suite_test.go | 4 +-
banyand/measure/metadata.go | 12 +--
banyand/measure/service.go | 32 ++++---
banyand/metadata/allocator.go | 11 +--
banyand/metadata/client.go | 32 ++++++-
banyand/metadata/metadata.go | 1 +
banyand/metadata/metadata_test.go | 7 +-
banyand/metadata/schema/checker.go | 9 +-
banyand/metadata/schema/{node.go => endpoint.go} | 35 ++++---
banyand/metadata/schema/etcd.go | 61 ++++++++++++
banyand/metadata/schema/node.go | 28 ++++--
banyand/metadata/schema/schema.go | 46 ++++-----
banyand/metadata/server.go | 9 +-
banyand/query/processor.go | 7 +-
banyand/stream/service.go | 17 ++--
banyand/stream/stream_suite_test.go | 4 +-
docs/api-reference.md | 113 ++++++++---------------
pkg/run/run.go | 85 ++++++++++++-----
pkg/schema/metadata.go | 24 ++---
pkg/signal/handler.go | 3 +-
pkg/test/matcher.go | 82 ----------------
pkg/test/measure/etcd.go | 12 +--
pkg/test/setup.go | 4 +-
pkg/test/setup/setup.go | 6 +-
pkg/test/stream/etcd.go | 10 +-
test/stress/cases/istio/repo.go | 2 +-
39 files changed, 473 insertions(+), 381 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index e537ba38..20d2bee1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
- Document the clustering.
- Support multiple roles for banyand server.
- Support for recovery buffer using wal.
+- Register the node role to the metadata registry.
### Bugs
diff --git a/api/common/id.go b/api/common/id.go
index 6cc879ca..c09c58d1 100644
--- a/api/common/id.go
+++ b/api/common/id.go
@@ -19,6 +19,8 @@ package common
import (
"context"
+ "crypto/rand"
+ "encoding/base64"
"fmt"
"github.com/apache/skywalking-banyandb/pkg/convert"
@@ -110,3 +112,45 @@ func NewError(tpl string, args ...any) Error {
func (e Error) Msg() string {
return e.msg
}
+
+// NodeID identities a node in a cluster.
+type NodeID string
+
+// GenerateNodeID generates a node id.
+func GenerateNodeID(prefix string, statefulID string) (NodeID, error) {
+ // If statefulID is empty, return prefix + random suffix.
+ if statefulID == "" {
+ suffix, err := generateRandomString(8)
+ if err != nil {
+ return NodeID(""), err
+ }
+ return NodeID(fmt.Sprintf("%s-%s", prefix, suffix)), nil
+ }
+ return NodeID(fmt.Sprintf("%s-%s", prefix, statefulID)), nil
+}
+
+func generateRandomString(length int) (string, error) {
+ randomBytes := make([]byte, length)
+ _, err := rand.Read(randomBytes)
+ if err != nil {
+ return "", err
+ }
+
+ // Encode random bytes to base64 URL encoding
+ randomString := base64.RawURLEncoding.EncodeToString(randomBytes)
+
+ // Trim any padding characters '=' from the end of the string
+ randomString = randomString[:length]
+
+ return randomString, nil
+}
+
+// ContextNodeIDKey is a context key to store the node id.
+var ContextNodeIDKey = contextNodeIDKey{}
+
+type contextNodeIDKey struct{}
+
+// ContextNodeRolesKey is a context key to store the node roles.
+var ContextNodeRolesKey = contextNodeRolesKey{}
+
+type contextNodeRolesKey struct{}
diff --git a/api/proto/banyandb/database/v1/database.proto b/api/proto/banyandb/database/v1/database.proto
index c530b60b..2e0bb6d9 100644
--- a/api/proto/banyandb/database/v1/database.proto
+++ b/api/proto/banyandb/database/v1/database.proto
@@ -25,19 +25,40 @@ import "google/protobuf/timestamp.proto";
option go_package = "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1";
option java_package = "org.apache.skywalking.banyandb.database.v1";
+enum Role {
+ ROLE_UNSPECIFIED = 0;
+ ROLE_META = 1;
+ ROLE_DATA = 2;
+ ROLE_QUERY = 3;
+ ROLE_LIAISON = 4;
+}
+
message Node {
- string id = 1;
- common.v1.Metadata metadata = 2;
- string addr = 3;
- google.protobuf.Timestamp updated_at = 4;
- google.protobuf.Timestamp created_at = 5;
+ string name = 1;
+ repeated Role roles = 2;
+ google.protobuf.Timestamp created_at = 3;
+}
+
+message Endpoint {
+ string name = 1;
+ string node = 2;
+ repeated string addresses = 3;
+ uint32 port = 4;
+ Protocol protocol = 5;
+ google.protobuf.Timestamp created_at = 6;
+}
+
+enum Protocol {
+ PROTOCOL_UNSPECIFIED = 0;
+ PROTOCOL_HTTP = 1;
+ PROTOCOL_GRPC = 2;
}
message Shard {
uint64 id = 1;
common.v1.Metadata metadata = 2;
common.v1.Catalog catalog = 3;
- Node node = 4;
+ string node = 4;
uint32 total = 5;
google.protobuf.Timestamp updated_at = 6;
google.protobuf.Timestamp created_at = 7;
diff --git a/api/proto/banyandb/database/v1/event.proto b/api/proto/banyandb/database/v1/event.proto
deleted file mode 100644
index 19f98f68..00000000
--- a/api/proto/banyandb/database/v1/event.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// Licensed to Apache Software Foundation (ASF) under one or more contributor
-// license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright
-// ownership. Apache Software Foundation (ASF) licenses this file to you under
-// the Apache License, Version 2.0 (the "License"); you may
-// not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-syntax = "proto3";
-
-package banyandb.database.v1;
-
-import "banyandb/common/v1/common.proto";
-import "banyandb/database/v1/database.proto";
-import "google/protobuf/timestamp.proto";
-
-option go_package = "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1";
-option java_package = "org.apache.skywalking.banyandb.database.v1";
-
-enum Action {
- ACTION_UNSPECIFIED = 0;
- ACTION_PUT = 1;
- ACTION_DELETE = 2;
-}
-
-message ShardEvent {
- Shard shard = 1;
- Action action = 2;
- google.protobuf.Timestamp time = 3;
-}
-
-message EntityEvent {
- common.v1.Metadata subject = 1;
- message TagLocator {
- uint32 family_offset = 1;
- uint32 tag_offset = 2;
- }
- repeated TagLocator entity_locator = 2;
- Action action = 3;
- google.protobuf.Timestamp time = 4;
-}
diff --git a/banyand/internal/cmd/liaison.go b/banyand/internal/cmd/liaison.go
index 97dff1e7..10ba5c8e 100644
--- a/banyand/internal/cmd/liaison.go
+++ b/banyand/internal/cmd/liaison.go
@@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
+ "github.com/apache/skywalking-banyandb/api/common"
"github.com/apache/skywalking-banyandb/banyand/liaison"
"github.com/apache/skywalking-banyandb/banyand/liaison/http"
"github.com/apache/skywalking-banyandb/banyand/metadata"
@@ -82,10 +83,14 @@ func newLiaisonCmd() *cobra.Command {
return logger.Init(logging)
},
RunE: func(cmd *cobra.Command, args []string) (err error) {
+ nodeID, err := common.GenerateNodeID("liaison", "")
+ if err != nil {
+ return err
+ }
fmt.Print(logo)
logger.GetLogger().Info().Msg("starting as a liaison server")
// Spawn our go routines and wait for shutdown.
- if err := liaisonGroup.Run(); err != nil {
+ if err := liaisonGroup.Run(context.WithValue(context.Background(), common.ContextNodeIDKey, nodeID)); err != nil {
logger.GetLogger().Error().Err(err).Stack().Str("name", liaisonGroup.Name()).Msg("Exit")
os.Exit(-1)
}
diff --git a/banyand/internal/cmd/meta.go b/banyand/internal/cmd/meta.go
index df7530d2..125b5be4 100644
--- a/banyand/internal/cmd/meta.go
+++ b/banyand/internal/cmd/meta.go
@@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
+ "github.com/apache/skywalking-banyandb/api/common"
"github.com/apache/skywalking-banyandb/banyand/metadata"
"github.com/apache/skywalking-banyandb/banyand/observability"
"github.com/apache/skywalking-banyandb/pkg/config"
@@ -67,10 +68,17 @@ func newMetaCmd() *cobra.Command {
return logger.Init(logging)
},
RunE: func(cmd *cobra.Command, args []string) (err error) {
+ if flagNodeID == "" {
+ return fmt.Errorf("data node id is required")
+ }
+ nodeID, err := common.GenerateNodeID("meta", flagNodeID)
+ if err != nil {
+ return err
+ }
fmt.Print(logo)
logger.GetLogger().Info().Msg("starting as a meta server")
// Spawn our go routines and wait for shutdown.
- if err := metaGroup.Run(); err != nil {
+ if err := metaGroup.Run(context.WithValue(context.Background(), common.ContextNodeIDKey, nodeID)); err != nil {
logger.GetLogger().Error().Err(err).Stack().Str("name", metaGroup.Name()).Msg("Exit")
os.Exit(-1)
}
@@ -78,6 +86,7 @@ func newMetaCmd() *cobra.Command {
},
}
+ metaCmd.Flags().StringVar(&flagNodeID, "meta-node-id", "", "the meta node id")
metaCmd.Flags().StringVar(&logging.Env, "logging-env", "prod", "the logging")
metaCmd.Flags().StringVar(&logging.Level, "logging-level", "info", "the root level of logging")
metaCmd.Flags().StringArrayVar(&logging.Modules, "logging-modules", nil, "the specific module")
diff --git a/banyand/internal/cmd/root.go b/banyand/internal/cmd/root.go
index da67766d..2d409525 100644
--- a/banyand/internal/cmd/root.go
+++ b/banyand/internal/cmd/root.go
@@ -49,3 +49,5 @@ BanyanDB, as an observability database, aims to ingest, analyze and store Metric
cmd.AddCommand(newLiaisonCmd())
return cmd
}
+
+var flagNodeID string
diff --git a/banyand/internal/cmd/standalone.go b/banyand/internal/cmd/standalone.go
index 9d6eccaa..16a0cd93 100644
--- a/banyand/internal/cmd/standalone.go
+++ b/banyand/internal/cmd/standalone.go
@@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
+ "github.com/apache/skywalking-banyandb/api/common"
"github.com/apache/skywalking-banyandb/banyand/liaison"
"github.com/apache/skywalking-banyandb/banyand/liaison/http"
"github.com/apache/skywalking-banyandb/banyand/measure"
@@ -100,10 +101,17 @@ func newStandaloneCmd() *cobra.Command {
return logger.Init(logging)
},
RunE: func(cmd *cobra.Command, args []string) (err error) {
+ if flagNodeID == "" {
+ return fmt.Errorf("data node id is required")
+ }
+ nodeID, err := common.GenerateNodeID("standalone", flagNodeID)
+ if err != nil {
+ return err
+ }
fmt.Print(logo)
logger.GetLogger().Info().Msg("starting as a standalone server")
// Spawn our go routines and wait for shutdown.
- if err := standaloneGroup.Run(); err != nil {
+ if err := standaloneGroup.Run(context.WithValue(context.Background(), common.ContextNodeIDKey, nodeID)); err != nil {
logger.GetLogger().Error().Err(err).Stack().Str("name", standaloneGroup.Name()).Msg("Exit")
os.Exit(-1)
}
@@ -111,6 +119,7 @@ func newStandaloneCmd() *cobra.Command {
},
}
+ standaloneCmd.Flags().StringVar(&flagNodeID, "data-node-id", "", "the data node id of the standalone server")
standaloneCmd.Flags().StringVar(&logging.Env, "logging-env", "prod", "the logging")
standaloneCmd.Flags().StringVar(&logging.Level, "logging-level", "info", "the root level of logging")
standaloneCmd.Flags().StringArrayVar(&logging.Modules, "logging-modules", nil, "the specific module")
diff --git a/banyand/internal/cmd/storage.go b/banyand/internal/cmd/storage.go
index 7d297fc0..c82e8269 100644
--- a/banyand/internal/cmd/storage.go
+++ b/banyand/internal/cmd/storage.go
@@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
+ "github.com/apache/skywalking-banyandb/api/common"
"github.com/apache/skywalking-banyandb/banyand/measure"
"github.com/apache/skywalking-banyandb/banyand/metadata"
"github.com/apache/skywalking-banyandb/banyand/observability"
@@ -114,10 +115,17 @@ func newStorageCmd() *cobra.Command {
}
},
RunE: func(cmd *cobra.Command, args []string) (err error) {
+ if flagNodeID == "" && flagStorageMode != storageModeQuery {
+ return fmt.Errorf("data node id is required")
+ }
+ nodeID, err := common.GenerateNodeID(flagStorageMode, flagNodeID)
+ if err != nil {
+ return err
+ }
fmt.Print(logo)
logger.GetLogger().Info().Msg("starting as a storage server")
// Spawn our go routines and wait for shutdown.
- if err := storageGroup.Run(); err != nil {
+ if err := storageGroup.Run(context.WithValue(context.Background(), common.ContextNodeIDKey, nodeID)); err != nil {
logger.GetLogger().Error().Err(err).Stack().Str("name", storageGroup.Name()).Msg("Exit")
os.Exit(-1)
}
@@ -125,6 +133,7 @@ func newStorageCmd() *cobra.Command {
},
}
+ storageCmd.Flags().StringVar(&flagNodeID, "data-node-id", "", "the data node id")
storageCmd.Flags().StringVar(&logging.Env, "logging-env", "prod", "the logging")
storageCmd.Flags().StringVar(&logging.Level, "logging-level", "info", "the root level of logging")
storageCmd.Flags().StringArrayVar(&logging.Modules, "logging-modules", nil, "the specific module")
diff --git a/banyand/liaison/grpc/discovery.go b/banyand/liaison/grpc/discovery.go
index a2a38841..606d93fb 100644
--- a/banyand/liaison/grpc/discovery.go
+++ b/banyand/liaison/grpc/discovery.go
@@ -60,9 +60,9 @@ func newDiscoveryService(pipeline queue.Queue, kind schema.Kind, metadataRepo me
}
}
-func (ds *discoveryService) initialize() error {
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- groups, err := ds.metadataRepo.GroupRegistry().ListGroup(ctx)
+func (ds *discoveryService) initialize(ctx context.Context) error {
+ ctxLocal, cancel := context.WithTimeout(ctx, 5*time.Second)
+ groups, err := ds.metadataRepo.GroupRegistry().ListGroup(ctxLocal)
cancel()
if err != nil {
return err
@@ -74,8 +74,8 @@ func (ds *discoveryService) initialize() error {
default:
continue
}
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- shards, innerErr := ds.metadataRepo.ShardRegistry().ListShard(ctx, schema.ListOpt{Group: g.Metadata.Name})
+ ctxLocal, cancel := context.WithTimeout(ctx, 5*time.Second)
+ shards, innerErr := ds.metadataRepo.ShardRegistry().ListShard(ctxLocal, schema.ListOpt{Group: g.Metadata.Name})
cancel()
if innerErr != nil {
return innerErr
@@ -93,8 +93,8 @@ func (ds *discoveryService) initialize() error {
switch ds.kind {
case schema.KindMeasure:
- ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
- mm, innerErr := ds.metadataRepo.MeasureRegistry().ListMeasure(ctx, schema.ListOpt{Group: g.Metadata.Name})
+ ctxLocal, cancel = context.WithTimeout(ctx, 5*time.Second)
+ mm, innerErr := ds.metadataRepo.MeasureRegistry().ListMeasure(ctxLocal, schema.ListOpt{Group: g.Metadata.Name})
cancel()
if innerErr != nil {
return innerErr
@@ -110,8 +110,8 @@ func (ds *discoveryService) initialize() error {
})
}
case schema.KindStream:
- ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
- ss, innerErr := ds.metadataRepo.StreamRegistry().ListStream(ctx, schema.ListOpt{Group: g.Metadata.Name})
+ ctxLocal, cancel = context.WithTimeout(ctx, 5*time.Second)
+ ss, innerErr := ds.metadataRepo.StreamRegistry().ListStream(ctxLocal, schema.ListOpt{Group: g.Metadata.Name})
cancel()
if innerErr != nil {
return innerErr
diff --git a/banyand/liaison/grpc/registry_test.go b/banyand/liaison/grpc/registry_test.go
index 4b12a1ac..213f5242 100644
--- a/banyand/liaison/grpc/registry_test.go
+++ b/banyand/liaison/grpc/registry_test.go
@@ -212,6 +212,6 @@ func (p *preloadStreamService) Name() string {
return "preload-stream"
}
-func (p *preloadStreamService) PreRun() error {
- return teststream.PreloadSchema(p.metaSvc.SchemaRegistry())
+func (p *preloadStreamService) PreRun(ctx context.Context) error {
+ return teststream.PreloadSchema(ctx, p.metaSvc.SchemaRegistry())
}
diff --git a/banyand/liaison/grpc/server.go b/banyand/liaison/grpc/server.go
index 2bb90664..35fb4653 100644
--- a/banyand/liaison/grpc/server.go
+++ b/banyand/liaison/grpc/server.go
@@ -119,7 +119,7 @@ func NewServer(_ context.Context, pipeline queue.Queue, schemaRegistry metadata.
return s
}
-func (s *server) PreRun() error {
+func (s *server) PreRun(ctx context.Context) error {
s.log = logger.GetLogger("liaison-grpc")
s.streamSVC.setLogger(s.log)
s.measureSVC.setLogger(s.log)
@@ -129,7 +129,7 @@ func (s *server) PreRun() error {
}
for _, c := range components {
c.SetLogger(s.log)
- if err := c.initialize(); err != nil {
+ if err := c.initialize(ctx); err != nil {
return err
}
}
diff --git a/banyand/liaison/http/server.go b/banyand/liaison/http/server.go
index 2cbba9b8..60a432a7 100644
--- a/banyand/liaison/http/server.go
+++ b/banyand/liaison/http/server.go
@@ -114,7 +114,7 @@ func (p *service) Name() string {
return "liaison-http"
}
-func (p *service) PreRun() error {
+func (p *service) PreRun(_ context.Context) error {
p.l = logger.GetLogger(p.Name())
p.mux = chi.NewRouter()
diff --git a/banyand/measure/measure_suite_test.go b/banyand/measure/measure_suite_test.go
index a1c829bb..25e31fd9 100644
--- a/banyand/measure/measure_suite_test.go
+++ b/banyand/measure/measure_suite_test.go
@@ -54,8 +54,8 @@ func (p *preloadMeasureService) Name() string {
return "preload-measure"
}
-func (p *preloadMeasureService) PreRun() error {
- return testmeasure.PreloadSchema(p.metaSvc.SchemaRegistry())
+func (p *preloadMeasureService) PreRun(ctx context.Context) error {
+ return testmeasure.PreloadSchema(ctx, p.metaSvc.SchemaRegistry())
}
type services struct {
diff --git a/banyand/measure/metadata.go b/banyand/measure/metadata.go
index a86bfcc4..21d44fc0 100644
--- a/banyand/measure/metadata.go
+++ b/banyand/measure/metadata.go
@@ -119,7 +119,7 @@ func (sr *schemaRepo) OnAddOrUpdate(metadata schema.Metadata) {
}
case schema.KindTopNAggregation:
// createOrUpdate TopN schemas in advance
- _, err := createOrUpdateTopNMeasure(sr.metadata.MeasureRegistry(), metadata.Spec.(*databasev1.TopNAggregation))
+ _, err := createOrUpdateTopNMeasure(context.Background(), sr.metadata.MeasureRegistry(), metadata.Spec.(*databasev1.TopNAggregation))
if err != nil {
sr.l.Error().Err(err).Msg("fail to create/update topN measure")
return
@@ -134,13 +134,13 @@ func (sr *schemaRepo) OnAddOrUpdate(metadata schema.Metadata) {
}
}
-func createOrUpdateTopNMeasure(measureSchemaRegistry schema.Measure, topNSchema *databasev1.TopNAggregation) (*databasev1.Measure, error) {
- oldTopNSchema, err := measureSchemaRegistry.GetMeasure(context.TODO(), topNSchema.GetMetadata())
+func createOrUpdateTopNMeasure(ctx context.Context, measureSchemaRegistry schema.Measure, topNSchema *databasev1.TopNAggregation) (*databasev1.Measure, error) {
+ oldTopNSchema, err := measureSchemaRegistry.GetMeasure(ctx, topNSchema.GetMetadata())
if err != nil && !errors.Is(err, schema.ErrGRPCResourceNotFound) {
return nil, err
}
- sourceMeasureSchema, err := measureSchemaRegistry.GetMeasure(context.Background(), topNSchema.GetSourceMeasure())
+ sourceMeasureSchema, err := measureSchemaRegistry.GetMeasure(ctx, topNSchema.GetSourceMeasure())
if err != nil {
return nil, err
}
@@ -184,7 +184,7 @@ func createOrUpdateTopNMeasure(measureSchemaRegistry schema.Measure, topNSchema
Fields: []*databasev1.FieldSpec{TopNValueFieldSpec},
}
if oldTopNSchema == nil {
- if innerErr := measureSchemaRegistry.CreateMeasure(context.Background(), newTopNMeasure); innerErr != nil {
+ if innerErr := measureSchemaRegistry.CreateMeasure(ctx, newTopNMeasure); innerErr != nil {
return nil, innerErr
}
return newTopNMeasure, nil
@@ -198,7 +198,7 @@ func createOrUpdateTopNMeasure(measureSchemaRegistry schema.Measure, topNSchema
return oldTopNSchema, nil
}
// update
- if err = measureSchemaRegistry.UpdateMeasure(context.Background(), newTopNMeasure); err != nil {
+ if err = measureSchemaRegistry.UpdateMeasure(ctx, newTopNMeasure); err != nil {
return nil, err
}
return newTopNMeasure, nil
diff --git a/banyand/measure/service.go b/banyand/measure/service.go
index 6e46f841..24689347 100644
--- a/banyand/measure/service.go
+++ b/banyand/measure/service.go
@@ -103,11 +103,15 @@ func (s *service) Name() string {
return "measure"
}
-func (s *service) PreRun() error {
+func (s *service) Role() databasev1.Role {
+ return databasev1.Role_ROLE_DATA
+}
+
+func (s *service) PreRun(ctx context.Context) error {
s.l = logger.GetLogger(s.Name())
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- groups, err := s.metadata.GroupRegistry().ListGroup(ctx)
- cancel()
+ ctxGroup, cancelGroup := context.WithTimeout(ctx, 5*time.Second)
+ groups, err := s.metadata.GroupRegistry().ListGroup(ctxGroup)
+ cancelGroup()
if err != nil {
return err
}
@@ -123,20 +127,20 @@ func (s *service) PreRun() error {
if innerErr != nil {
return innerErr
}
- ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
+ ctxMeasure, cancelMeasure := context.WithTimeout(ctx, 5*time.Second)
allMeasureSchemas, innerErr := s.metadata.MeasureRegistry().
- ListMeasure(ctx, schema.ListOpt{Group: gp.GetSchema().GetMetadata().GetName()})
- cancel()
+ ListMeasure(ctxMeasure, schema.ListOpt{Group: gp.GetSchema().GetMetadata().GetName()})
+ cancelMeasure()
if innerErr != nil {
return innerErr
}
for _, measureSchema := range allMeasureSchemas {
// sanity check before calling StoreResource
// since StoreResource may be called inside the event loop
- if checkErr := s.sanityCheck(gp, measureSchema); checkErr != nil {
+ if checkErr := s.sanityCheck(ctx, gp, measureSchema); checkErr != nil {
return checkErr
}
- if _, innerErr := gp.StoreResource(measureSchema); innerErr != nil {
+ if _, innerErr := gp.StoreResource(ctx, measureSchema); innerErr != nil {
return innerErr
}
}
@@ -155,20 +159,20 @@ func (s *service) PreRun() error {
return nil
}
-func (s *service) sanityCheck(group resourceSchema.Group, measureSchema *databasev1.Measure) error {
+func (s *service) sanityCheck(ctx context.Context, group resourceSchema.Group, measureSchema *databasev1.Measure) error {
var topNAggrs []*databasev1.TopNAggregation
- ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+ ctxLocal, cancel := context.WithTimeout(ctx, 10*time.Second)
defer cancel()
- topNAggrs, err := s.metadata.MeasureRegistry().TopNAggregations(ctx, measureSchema.GetMetadata())
+ topNAggrs, err := s.metadata.MeasureRegistry().TopNAggregations(ctxLocal, measureSchema.GetMetadata())
if err != nil || len(topNAggrs) == 0 {
return err
}
for _, topNAggr := range topNAggrs {
- topNMeasure, innerErr := createOrUpdateTopNMeasure(s.metadata.MeasureRegistry(), topNAggr)
+ topNMeasure, innerErr := createOrUpdateTopNMeasure(ctx, s.metadata.MeasureRegistry(), topNAggr)
err = multierr.Append(err, innerErr)
if topNMeasure != nil {
- _, storeErr := group.StoreResource(topNMeasure)
+ _, storeErr := group.StoreResource(ctx, topNMeasure)
if storeErr != nil {
err = multierr.Append(err, storeErr)
}
diff --git a/banyand/metadata/allocator.go b/banyand/metadata/allocator.go
index acf52dbf..0607aacc 100644
--- a/banyand/metadata/allocator.go
+++ b/banyand/metadata/allocator.go
@@ -21,8 +21,6 @@ import (
"context"
"time"
- "google.golang.org/protobuf/types/known/timestamppb"
-
commonv1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/common/v1"
databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
"github.com/apache/skywalking-banyandb/banyand/metadata/schema"
@@ -51,8 +49,6 @@ func (a *allocator) OnAddOrUpdate(metadata schema.Metadata) {
if groupSchema.Catalog == commonv1.Catalog_CATALOG_UNSPECIFIED {
return
}
- now := time.Now()
- nowPb := timestamppb.New(now)
shardNum := groupSchema.GetResourceOpts().GetShardNum()
syncShard := func(id uint64) error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -63,12 +59,7 @@ func (a *allocator) OnAddOrUpdate(metadata schema.Metadata) {
Metadata: &commonv1.Metadata{
Name: groupSchema.GetMetadata().GetName(),
},
- Node: &databasev1.Node{
- Id: "TODO",
- CreatedAt: nowPb,
- UpdatedAt: nowPb,
- Addr: "TODO",
- },
+ Node: "TODO",
})
}
for i := 0; i < int(shardNum); i++ {
diff --git a/banyand/metadata/client.go b/banyand/metadata/client.go
index 0fc967c7..53384232 100644
--- a/banyand/metadata/client.go
+++ b/banyand/metadata/client.go
@@ -23,7 +23,9 @@ import (
"time"
"go.uber.org/multierr"
+ "google.golang.org/protobuf/types/known/timestamppb"
+ "github.com/apache/skywalking-banyandb/api/common"
commonv1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/common/v1"
databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
"github.com/apache/skywalking-banyandb/banyand/metadata/schema"
@@ -62,13 +64,31 @@ func (s *clientService) Validate() error {
return nil
}
-func (s *clientService) PreRun() error {
+func (s *clientService) PreRun(ctx context.Context) error {
var err error
s.schemaRegistry, err = schema.NewEtcdSchemaRegistry(schema.ConfigureServerEndpoints(s.endpoints))
if err != nil {
return err
}
-
+ val := ctx.Value(common.ContextNodeIDKey)
+ if val == nil {
+ return errors.New("node id is empty")
+ }
+ nodeID := val.(common.NodeID)
+ val = ctx.Value(common.ContextNodeRolesKey)
+ if val == nil {
+ return errors.New("node roles is empty")
+ }
+ nodeRoles := val.([]databasev1.Role)
+ ctxRegister, cancel := context.WithTimeout(ctx, time.Second*5)
+ defer cancel()
+ if err = s.schemaRegistry.RegisterNode(ctxRegister, &databasev1.Node{
+ Name: string(nodeID),
+ Roles: nodeRoles,
+ CreatedAt: timestamppb.Now(),
+ }); err != nil {
+ return err
+ }
s.alc = newAllocator(s.schemaRegistry, logger.GetLogger(s.Name()).Named("allocator"))
s.schemaRegistry.RegisterHandler(schema.KindGroup|schema.KindNode, s.alc)
return nil
@@ -120,10 +140,18 @@ func (s *clientService) ShardRegistry() schema.Shard {
return s.schemaRegistry
}
+func (s *clientService) EndpointRegistry() schema.Endpoint {
+ return s.schemaRegistry
+}
+
func (s *clientService) Name() string {
return "metadata"
}
+func (s *clientService) Role() databasev1.Role {
+ return databasev1.Role_ROLE_META
+}
+
func (s *clientService) IndexRules(ctx context.Context, subject *commonv1.Metadata) ([]*databasev1.IndexRule, error) {
bindings, err := s.schemaRegistry.ListIndexRuleBinding(ctx, schema.ListOpt{Group: subject.Group})
if err != nil {
diff --git a/banyand/metadata/metadata.go b/banyand/metadata/metadata.go
index 9bad1e72..91d5a25b 100644
--- a/banyand/metadata/metadata.go
+++ b/banyand/metadata/metadata.go
@@ -48,6 +48,7 @@ type Repo interface {
PropertyRegistry() schema.Property
ShardRegistry() schema.Shard
RegisterHandler(schema.Kind, schema.EventHandler)
+ EndpointRegistry() schema.Endpoint
}
// Service is the metadata repository.
diff --git a/banyand/metadata/metadata_test.go b/banyand/metadata/metadata_test.go
index 56eac46c..d6cb4b7a 100644
--- a/banyand/metadata/metadata_test.go
+++ b/banyand/metadata/metadata_test.go
@@ -23,6 +23,7 @@ import (
"github.com/stretchr/testify/assert"
+ "github.com/apache/skywalking-banyandb/api/common"
commonv1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/common/v1"
databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
"github.com/apache/skywalking-banyandb/pkg/logger"
@@ -48,14 +49,16 @@ func Test_service_RulesBySubject(t *testing.T) {
err = s.FlagSet().Parse([]string{"--metadata-root-path=" + rootDir})
is.NoError(err)
is.NoError(s.Validate())
- err = s.PreRun()
+ ctx = context.WithValue(ctx, common.ContextNodeIDKey, common.NodeID("test-node-id"))
+ ctx = context.WithValue(ctx, common.ContextNodeRolesKey, []databasev1.Role{databasev1.Role_ROLE_META})
+ err = s.PreRun(ctx)
is.NoError(err)
defer func() {
s.GracefulStop()
deferFn()
}()
- err = test.PreloadSchema(s.SchemaRegistry())
+ err = test.PreloadSchema(ctx, s.SchemaRegistry())
is.NoError(err)
tests := []struct {
diff --git a/banyand/metadata/schema/checker.go b/banyand/metadata/schema/checker.go
index 3d669cbc..80763e57 100644
--- a/banyand/metadata/schema/checker.go
+++ b/banyand/metadata/schema/checker.go
@@ -85,8 +85,7 @@ var checkerMap = map[Kind]equalityChecker{
KindNode: func(a, b proto.Message) bool {
return cmp.Equal(a, b,
protocmp.IgnoreUnknown(),
- protocmp.IgnoreFields(&databasev1.Node{}, "updated_at"),
- protocmp.IgnoreFields(&commonv1.Metadata{}, "id", "create_revision", "mod_revision"),
+ protocmp.IgnoreFields(&databasev1.Node{}, "created_at"),
protocmp.Transform())
},
KindShard: func(a, b proto.Message) bool {
@@ -96,6 +95,12 @@ var checkerMap = map[Kind]equalityChecker{
protocmp.IgnoreFields(&commonv1.Metadata{}, "id", "create_revision", "mod_revision"),
protocmp.Transform())
},
+ KindEndpoint: func(a, b proto.Message) bool {
+ return cmp.Equal(a, b,
+ protocmp.IgnoreUnknown(),
+ protocmp.IgnoreFields(&databasev1.Endpoint{}, "created_at"),
+ protocmp.Transform())
+ },
KindMask: func(a, b proto.Message) bool {
return false
},
diff --git a/banyand/metadata/schema/node.go b/banyand/metadata/schema/endpoint.go
similarity index 56%
copy from banyand/metadata/schema/node.go
copy to banyand/metadata/schema/endpoint.go
index 0c6dcdb1..cf143ecd 100644
--- a/banyand/metadata/schema/node.go
+++ b/banyand/metadata/schema/endpoint.go
@@ -25,29 +25,42 @@ import (
databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
)
-var nodeKeyPrefix = "/nodes/"
+var endpointKeyPrefix = "/endpoints/"
-func (e *etcdSchemaRegistry) ListNode(ctx context.Context, role Role) ([]*databasev1.Node, error) {
- if role == "" {
- return nil, BadRequest("group", "group should not be empty")
+func (e *etcdSchemaRegistry) ListEndpoint(ctx context.Context, nodeRole databasev1.Role) ([]*databasev1.Endpoint, error) {
+ nn, err := e.ListNode(ctx, nodeRole)
+ if err != nil {
+ return nil, err
}
- messages, err := e.listWithPrefix(ctx, listPrefixesForEntity(string(role), nodeKeyPrefix), func() proto.Message {
+ messages, err := e.listWithPrefix(ctx, endpointKeyPrefix, func() proto.Message {
return &databasev1.Node{}
})
if err != nil {
return nil, err
}
- entities := make([]*databasev1.Node, 0, len(messages))
+ entities := make([]*databasev1.Endpoint, 0, len(messages))
for _, message := range messages {
- entities = append(entities, message.(*databasev1.Node))
+ endpoint := message.(*databasev1.Endpoint)
+ for _, n := range nn {
+ if n.Name == endpoint.Node {
+ entities = append(entities, endpoint)
+ break
+ }
+ }
}
return entities, nil
}
-func formatNodePrefix(role Role) string {
- return nodeKeyPrefix + string(role)
+func (e *etcdSchemaRegistry) RegisterEndpoint(ctx context.Context, endpoint *databasev1.Endpoint) error {
+ return e.register(ctx, Metadata{
+ TypeMeta: TypeMeta{
+ Kind: KindEndpoint,
+ Name: endpoint.Name,
+ },
+ Spec: endpoint,
+ })
}
-func formatNodeKey(role Role, id string) string {
- return formatNodePrefix(role) + "/" + id
+func formatEndpointKey(name string) string {
+ return endpointKeyPrefix + name
}
diff --git a/banyand/metadata/schema/etcd.go b/banyand/metadata/schema/etcd.go
index 2c147f30..0dd053f4 100644
--- a/banyand/metadata/schema/etcd.go
+++ b/banyand/metadata/schema/etcd.go
@@ -345,6 +345,67 @@ func (e *etcdSchemaRegistry) delete(ctx context.Context, metadata Metadata) (boo
return false, nil
}
+func (e *etcdSchemaRegistry) register(ctx context.Context, metadata Metadata) error {
+ if !e.closer.AddRunning() {
+ return ErrClosed
+ }
+ defer e.closer.Done()
+ key, err := metadata.key()
+ if err != nil {
+ return err
+ }
+ getResp, err := e.client.Get(ctx, key)
+ if err != nil {
+ return err
+ }
+ if getResp.Count > 1 {
+ return errUnexpectedNumberOfEntities
+ }
+ if getResp.Count > 0 {
+ return errGRPCAlreadyExists
+ }
+ val, err := proto.Marshal(metadata.Spec.(proto.Message))
+ if err != nil {
+ return err
+ }
+ // Create a lease with a short TTL
+ lease, err := e.client.Grant(ctx, 5) // 5 seconds
+ if err != nil {
+ return err
+ }
+ _, err = e.client.Put(ctx, key, string(val), clientv3.WithLease(lease.ID))
+ if err != nil {
+ return err
+ }
+ // Keep the lease alive
+ // nolint:contextcheck
+ keepAliveChan, err := e.client.KeepAlive(context.Background(), lease.ID)
+ if err != nil {
+ return err
+ }
+ go func() {
+ if !e.closer.AddRunning() {
+ return
+ }
+ defer func() {
+ _, _ = e.client.Lease.Revoke(context.Background(), lease.ID)
+ e.closer.Done()
+ }()
+ for {
+ select {
+ case <-e.closer.CloseNotify():
+ return
+ case keepAliveResp := <-keepAliveChan:
+ if keepAliveResp == nil {
+ // The channel has been closed
+ return
+ }
+ }
+ }
+ }()
+ return nil
+}
+
func formatKey(entityPrefix string, metadata *commonv1.Metadata) string {
return groupsKeyPrefix + metadata.GetGroup() + entityPrefix + metadata.GetName()
}
diff --git a/banyand/metadata/schema/node.go b/banyand/metadata/schema/node.go
index 0c6dcdb1..d6d1fd4f 100644
--- a/banyand/metadata/schema/node.go
+++ b/banyand/metadata/schema/node.go
@@ -27,11 +27,11 @@ import (
var nodeKeyPrefix = "/nodes/"
-func (e *etcdSchemaRegistry) ListNode(ctx context.Context, role Role) ([]*databasev1.Node, error) {
- if role == "" {
+func (e *etcdSchemaRegistry) ListNode(ctx context.Context, role databasev1.Role) ([]*databasev1.Node, error) {
+ if role == databasev1.Role_ROLE_UNSPECIFIED {
return nil, BadRequest("group", "group should not be empty")
}
- messages, err := e.listWithPrefix(ctx, listPrefixesForEntity(string(role), nodeKeyPrefix), func() proto.Message {
+ messages, err := e.listWithPrefix(ctx, nodeKeyPrefix, func() proto.Message {
return &databasev1.Node{}
})
if err != nil {
@@ -39,15 +39,27 @@ func (e *etcdSchemaRegistry) ListNode(ctx context.Context, role Role) ([]*databa
}
entities := make([]*databasev1.Node, 0, len(messages))
for _, message := range messages {
- entities = append(entities, message.(*databasev1.Node))
+ node := message.(*databasev1.Node)
+ for _, r := range node.Roles {
+ if r == role {
+ entities = append(entities, node)
+ break
+ }
+ }
}
return entities, nil
}
-func formatNodePrefix(role Role) string {
- return nodeKeyPrefix + string(role)
+func (e *etcdSchemaRegistry) RegisterNode(ctx context.Context, node *databasev1.Node) error {
+ return e.register(ctx, Metadata{
+ TypeMeta: TypeMeta{
+ Kind: KindNode,
+ Name: node.Name,
+ },
+ Spec: node,
+ })
}
-func formatNodeKey(role Role, id string) string {
- return formatNodePrefix(role) + "/" + id
+func formatNodeKey(name string) string {
+ return nodeKeyPrefix + name
}
diff --git a/banyand/metadata/schema/schema.go b/banyand/metadata/schema/schema.go
index fd97a1d6..22ae1a14 100644
--- a/banyand/metadata/schema/schema.go
+++ b/banyand/metadata/schema/schema.go
@@ -52,9 +52,10 @@ const (
KindProperty
KindNode
KindShard
+ KindEndpoint
KindMask = KindGroup | KindStream | KindMeasure |
KindIndexRuleBinding | KindIndexRule |
- KindTopNAggregation | KindProperty | KindNode | KindShard
+ KindTopNAggregation | KindProperty | KindNode | KindShard | KindEndpoint
)
// ListOpt contains options to list resources.
@@ -74,6 +75,7 @@ type Registry interface {
Property
Node
Shard
+ Endpoint
RegisterHandler(Kind, EventHandler)
}
@@ -114,6 +116,8 @@ func (tm TypeMeta) Unmarshal(data []byte) (m proto.Message, err error) {
m = &databasev1.Node{}
case KindShard:
m = &databasev1.Shard{}
+ case KindEndpoint:
+ m = &databasev1.Endpoint{}
default:
return nil, errUnsupportedEntityType
}
@@ -156,16 +160,14 @@ func (m Metadata) key() (string, error) {
Name: m.Name,
}), nil
case KindNode:
- r, err := strToRole(m.Group)
- if err != nil {
- return "", err
- }
- return formatNodeKey(r, m.Name), nil
+ return formatNodeKey(m.Name), nil
case KindShard:
return formatShardKey(&commonv1.Metadata{
Group: m.Group,
Name: m.Name,
}), nil
+ case KindEndpoint:
+ return formatEndpointKey(m.Name), nil
default:
return "", errUnsupportedEntityType
}
@@ -247,32 +249,16 @@ type Property interface {
DeleteProperty(ctx context.Context, metadata *propertyv1.Metadata, tags []string) (bool, uint32, error)
}
-// Role is the role of node.
-type Role string
-
-const (
- // RoleMeta is the role of meta node.
- RoleMeta = "meta"
- // RoleData is the role of data node.
- RoleData = "data"
- // RoleQuery is the role of query node.
- RoleQuery = "query"
- // RoleLiaison is the role of liaison node.
- RoleLiaison = "liaison"
-)
-
-func strToRole(role string) (Role, error) {
- switch role {
- case RoleMeta, RoleData, RoleQuery, RoleLiaison:
- return Role(role), nil
- default:
- return "", errors.New("invalid role")
- }
-}
-
// Node allows CRUD node schemas in a group.
type Node interface {
- ListNode(ctx context.Context, role Role) ([]*databasev1.Node, error)
+ ListNode(ctx context.Context, role databasev1.Role) ([]*databasev1.Node, error)
+ RegisterNode(ctx context.Context, node *databasev1.Node) error
+}
+
+// Endpoint allows CRUD endpoint schemas in a group.
+type Endpoint interface {
+ ListEndpoint(ctx context.Context, nodeRole databasev1.Role) ([]*databasev1.Endpoint, error)
+ RegisterEndpoint(ctx context.Context, endpoint *databasev1.Endpoint) error
}
// Shard allows CRUD shard schemas in a group.
diff --git a/banyand/metadata/server.go b/banyand/metadata/server.go
index ce004e3c..a4c59359 100644
--- a/banyand/metadata/server.go
+++ b/banyand/metadata/server.go
@@ -22,6 +22,7 @@ import (
"errors"
"strings"
+ databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
"github.com/apache/skywalking-banyandb/banyand/metadata/embeddedetcd"
"github.com/apache/skywalking-banyandb/pkg/run"
)
@@ -38,6 +39,10 @@ func (s *server) Name() string {
return "metadata"
}
+func (s *server) Role() databasev1.Role {
+ return databasev1.Role_ROLE_META
+}
+
func (s *server) FlagSet() *run.FlagSet {
fs := run.NewFlagSet("metadata")
fs.StringVar(&s.rootDir, "metadata-root-path", "/tmp", "the root path of metadata")
@@ -63,14 +68,14 @@ func (s *server) Validate() error {
return s.Service.Validate()
}
-func (s *server) PreRun() error {
+func (s *server) PreRun(ctx context.Context) error {
var err error
s.metaServer, err = embeddedetcd.NewServer(embeddedetcd.RootDir(s.rootDir), embeddedetcd.ConfigureListener(s.listenClientURL, s.listenPeerURL))
if err != nil {
return err
}
<-s.metaServer.ReadyNotify()
- return s.Service.PreRun()
+ return s.Service.PreRun(ctx)
}
func (s *server) Serve() run.StopNotify {
diff --git a/banyand/query/processor.go b/banyand/query/processor.go
index 2884f8d2..cf36474a 100644
--- a/banyand/query/processor.go
+++ b/banyand/query/processor.go
@@ -25,6 +25,7 @@ import (
"github.com/apache/skywalking-banyandb/api/common"
"github.com/apache/skywalking-banyandb/api/data"
+ databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
measurev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/measure/v1"
streamv1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/stream/v1"
"github.com/apache/skywalking-banyandb/banyand/measure"
@@ -180,7 +181,11 @@ func (q *queryService) Name() string {
return moduleName
}
-func (q *queryService) PreRun() error {
+func (q *queryService) Role() databasev1.Role {
+ return databasev1.Role_ROLE_QUERY
+}
+
+func (q *queryService) PreRun(_ context.Context) error {
q.log = logger.GetLogger(moduleName)
return multierr.Combine(
q.pipeline.Subscribe(data.TopicStreamQuery, q.sqp),
diff --git a/banyand/stream/service.go b/banyand/stream/service.go
index 07749f5b..f614b9e9 100644
--- a/banyand/stream/service.go
+++ b/banyand/stream/service.go
@@ -26,6 +26,7 @@ import (
"github.com/apache/skywalking-banyandb/api/data"
commonv1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/common/v1"
+ databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
"github.com/apache/skywalking-banyandb/banyand/metadata"
"github.com/apache/skywalking-banyandb/banyand/metadata/schema"
"github.com/apache/skywalking-banyandb/banyand/observability"
@@ -93,10 +94,14 @@ func (s *service) Name() string {
return "stream"
}
-func (s *service) PreRun() error {
+func (s *service) Role() databasev1.Role {
+ return databasev1.Role_ROLE_DATA
+}
+
+func (s *service) PreRun(ctx context.Context) error {
s.l = logger.GetLogger(s.Name())
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- groups, err := s.metadata.GroupRegistry().ListGroup(ctx)
+ ctxLocal, cancel := context.WithTimeout(ctx, 5*time.Second)
+ groups, err := s.metadata.GroupRegistry().ListGroup(ctxLocal)
cancel()
if err != nil {
return err
@@ -112,14 +117,14 @@ func (s *service) PreRun() error {
if err != nil {
return err
}
- ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
- schemas, err := s.metadata.StreamRegistry().ListStream(ctx, schema.ListOpt{Group: gp.GetSchema().GetMetadata().Name})
+ ctxLocal, cancel := context.WithTimeout(ctx, 5*time.Second)
+ schemas, err := s.metadata.StreamRegistry().ListStream(ctxLocal, schema.ListOpt{Group: gp.GetSchema().GetMetadata().Name})
cancel()
if err != nil {
return err
}
for _, sa := range schemas {
- if _, innerErr := gp.StoreResource(sa); innerErr != nil {
+ if _, innerErr := gp.StoreResource(ctx, sa); innerErr != nil {
return innerErr
}
}
diff --git a/banyand/stream/stream_suite_test.go b/banyand/stream/stream_suite_test.go
index fa5fa2c3..898da965 100644
--- a/banyand/stream/stream_suite_test.go
+++ b/banyand/stream/stream_suite_test.go
@@ -53,8 +53,8 @@ func (p *preloadStreamService) Name() string {
return "preload-stream"
}
-func (p *preloadStreamService) PreRun() error {
- return teststream.PreloadSchema(p.metaSvc.SchemaRegistry())
+func (p *preloadStreamService) PreRun(ctx context.Context) error {
+ return teststream.PreloadSchema(ctx, p.metaSvc.SchemaRegistry())
}
type services struct {
diff --git a/docs/api-reference.md b/docs/api-reference.md
index 96931a18..01e67e6a 100644
--- a/docs/api-reference.md
+++ b/docs/api-reference.md
@@ -13,15 +13,12 @@
- [IntervalRule.Unit](#banyandb-common-v1-IntervalRule-Unit)
- [banyandb/database/v1/database.proto](#banyandb_database_v1_database-proto)
+ - [Endpoint](#banyandb-database-v1-Endpoint)
- [Node](#banyandb-database-v1-Node)
- [Shard](#banyandb-database-v1-Shard)
-- [banyandb/database/v1/event.proto](#banyandb_database_v1_event-proto)
- - [EntityEvent](#banyandb-database-v1-EntityEvent)
- - [EntityEvent.TagLocator](#banyandb-database-v1-EntityEvent-TagLocator)
- - [ShardEvent](#banyandb-database-v1-ShardEvent)
-
- - [Action](#banyandb-database-v1-Action)
+ - [Protocol](#banyandb-database-v1-Protocol)
+ - [Role](#banyandb-database-v1-Role)
- [banyandb/model/v1/common.proto](#banyandb_model_v1_common-proto)
- [FieldValue](#banyandb-model-v1-FieldValue)
@@ -332,18 +329,19 @@ Metadata is for multi-tenant, multi-model use
-<a name="banyandb-database-v1-Node"></a>
+<a name="banyandb-database-v1-Endpoint"></a>
-### Node
+### Endpoint
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| id | [string](#string) | | |
-| metadata | [banyandb.common.v1.Metadata](#banyandb-common-v1-Metadata) | | |
-| addr | [string](#string) | | |
-| updated_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
+| name | [string](#string) | | |
+| node | [string](#string) | | |
+| addresses | [string](#string) | repeated | |
+| port | [uint32](#uint32) | | |
+| protocol | [Protocol](#banyandb-database-v1-Protocol) | | |
| created_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
@@ -351,106 +349,71 @@ Metadata is for multi-tenant, multi-model use
-<a name="banyandb-database-v1-Shard"></a>
+<a name="banyandb-database-v1-Node"></a>
-### Shard
+### Node
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| id | [uint64](#uint64) | | |
-| metadata | [banyandb.common.v1.Metadata](#banyandb-common-v1-Metadata) | | |
-| catalog | [banyandb.common.v1.Catalog](#banyandb-common-v1-Catalog) | | |
-| node | [Node](#banyandb-database-v1-Node) | | |
-| total | [uint32](#uint32) | | |
-| updated_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
+| name | [string](#string) | | |
+| roles | [Role](#banyandb-database-v1-Role) | repeated | |
| created_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
-
-
-
-
-
-
-
-
-
-
-<a name="banyandb_database_v1_event-proto"></a>
-<p align="right"><a href="#top">Top</a></p>
-
-## banyandb/database/v1/event.proto
-
-
-
-<a name="banyandb-database-v1-EntityEvent"></a>
-
-### EntityEvent
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| subject | [banyandb.common.v1.Metadata](#banyandb-common-v1-Metadata) | | |
-| entity_locator | [EntityEvent.TagLocator](#banyandb-database-v1-EntityEvent-TagLocator) | repeated | |
-| action | [Action](#banyandb-database-v1-Action) | | |
-| time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
-
+<a name="banyandb-database-v1-Shard"></a>
-
-
-
-<a name="banyandb-database-v1-EntityEvent-TagLocator"></a>
-
-### EntityEvent.TagLocator
+### Shard
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| family_offset | [uint32](#uint32) | | |
-| tag_offset | [uint32](#uint32) | | |
-
-
-
-
+| id | [uint64](#uint64) | | |
+| metadata | [banyandb.common.v1.Metadata](#banyandb-common-v1-Metadata) | | |
+| catalog | [banyandb.common.v1.Catalog](#banyandb-common-v1-Catalog) | | |
+| node | [string](#string) | | |
+| total | [uint32](#uint32) | | |
+| updated_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
+| created_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
-<a name="banyandb-database-v1-ShardEvent"></a>
-### ShardEvent
+
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| shard | [Shard](#banyandb-database-v1-Shard) | | |
-| action | [Action](#banyandb-database-v1-Action) | | |
-| time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
+<a name="banyandb-database-v1-Protocol"></a>
+### Protocol
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| PROTOCOL_UNSPECIFIED | 0 | |
+| PROTOCOL_HTTP | 1 | |
+| PROTOCOL_GRPC | 2 | |
-
-<a name="banyandb-database-v1-Action"></a>
+<a name="banyandb-database-v1-Role"></a>
-### Action
+### Role
| Name | Number | Description |
| ---- | ------ | ----------- |
-| ACTION_UNSPECIFIED | 0 | |
-| ACTION_PUT | 1 | |
-| ACTION_DELETE | 2 | |
+| ROLE_UNSPECIFIED | 0 | |
+| ROLE_META | 1 | |
+| ROLE_DATA | 2 | |
+| ROLE_QUERY | 3 | |
+| ROLE_LIAISON | 4 | |
diff --git a/pkg/run/run.go b/pkg/run/run.go
index 4630ff07..8e9a14c2 100644
--- a/pkg/run/run.go
+++ b/pkg/run/run.go
@@ -19,9 +19,11 @@
package run
import (
+ "context"
"fmt"
"os"
"path"
+ "sort"
"sync"
"github.com/oklog/run"
@@ -29,6 +31,8 @@ import (
"github.com/spf13/pflag"
"go.uber.org/multierr"
+ "github.com/apache/skywalking-banyandb/api/common"
+ databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
"github.com/apache/skywalking-banyandb/pkg/config"
"github.com/apache/skywalking-banyandb/pkg/logger"
)
@@ -55,6 +59,12 @@ type Unit interface {
Name() string
}
+// Role is an interface that should be implemented by Group Unit objects that
+// need to be able to return their Role.
+type Role interface {
+ Role() databasev1.Role
+}
+
// Config interface should be implemented by Group Unit objects that manage
// their own configuration through the use of flags.
// If a Unit's Validate returns an error it will stop the Group immediately.
@@ -73,26 +83,7 @@ type Config interface {
type PreRunner interface {
// Unit for Group registration and identification
Unit
- PreRun() error
-}
-
-// NewPreRunner takes a name and a standalone pre runner compatible function
-// and turns them into a Group compatible PreRunner, ready for registration.
-func NewPreRunner(name string, fn func() error) PreRunner {
- return preRunner{name: name, fn: fn}
-}
-
-type preRunner struct {
- fn func() error
- name string
-}
-
-func (p preRunner) Name() string {
- return p.name
-}
-
-func (p preRunner) PreRun() error {
- return p.fn()
+ PreRun(context.Context) error
}
// StopNotify sends the stopped event to the running system.
@@ -128,6 +119,7 @@ type Group struct {
c []Config
p []PreRunner
s []Service
+ rr []Role
showRunGroup bool
configured bool
}
@@ -172,6 +164,10 @@ func (g *Group) Register(units ...Unit) []bool {
g.s = append(g.s, s)
hasRegistered[idx] = true
}
+ if r, ok := units[idx].(Role); ok {
+ g.rr = append(g.rr, r)
+ hasRegistered[idx] = true
+ }
}
return hasRegistered
}
@@ -208,6 +204,14 @@ func (g *Group) Deregister(units ...Unit) []bool {
}
}
}
+ if r, ok := units[idx].(Role); ok {
+ for i := range g.rr {
+ if g.rr[i] == r {
+ g.rr[i] = nil
+ hasDeregistered[idx] = true
+ }
+ }
+ }
}
return hasDeregistered
}
@@ -325,7 +329,7 @@ func (g *Group) RunConfig() (interrupted bool, err error) {
// - Validate() Validate Config Units. Exit on first error.
//
// PreRunner phase (serially, in order of Unit registration)
-// - PreRun() Execute PreRunner Units. Exit on first error.
+// - PreRun(ctx context.Context) Execute PreRunner Units. Exit on first error.
//
// Service phase (concurrently)
// - Serve() Execute all Service Units in separate Go routines.
@@ -334,9 +338,11 @@ func (g *Group) RunConfig() (interrupted bool, err error) {
//
// Run will return with the originating error on:
// - first Config.Validate() returning an error
-// - first PreRunner.PreRun() returning an error
+// - first PreRunner.PreRun(ctx context.Context) returning an error
// - first Service.Serve() returning (error or nil)
-func (g *Group) Run() (err error) {
+//
+//nolint:contextcheck
+func (g *Group) Run(ctx context.Context) (err error) {
// run config registration and flag parsing stages
if interrupted, errRun := g.RunConfig(); interrupted || errRun != nil {
return errRun
@@ -346,7 +352,38 @@ func (g *Group) Run() (err error) {
g.log.Fatal().Err(err).Stack().Msg("unexpected exit")
}
}()
+ rr := make([]databasev1.Role, 0, len(g.rr))
+ for idx := range g.rr {
+ if g.rr[idx] == nil || g.rr[idx].Role() == databasev1.Role_ROLE_UNSPECIFIED {
+ continue
+ }
+ rr = append(rr, g.rr[idx].Role())
+ }
+ // Sort and deduplicate roles
+ sort.Slice(rr, func(i, j int) bool {
+ return rr[i] < rr[j]
+ })
+ deduplicateRoles := func(rr []databasev1.Role) []databasev1.Role {
+ if len(rr) < 2 {
+ return rr
+ }
+ // deduplicate roles
+ rrDedup := make([]databasev1.Role, 0, len(rr))
+ for i := 0; i < len(rr)-1; i++ {
+ if rr[i] != rr[i+1] {
+ rrDedup = append(rrDedup, rr[i])
+ }
+ }
+ rrDedup = append(rrDedup, rr[len(rr)-1])
+ return rrDedup
+ }
+ rr = deduplicateRoles(rr)
+
+ g.log.Info().Interface("roles", rr).Msg("the node will run as")
+ if ctx == nil {
+ ctx = context.Background()
+ }
// execute pre run stage and exit on error
for idx := range g.p {
// a PreRunner might have been deregistered during Run
@@ -354,7 +391,7 @@ func (g *Group) Run() (err error) {
continue
}
g.log.Debug().Uint32("ran", uint32(idx+1)).Uint32("total", uint32(len(g.p))).Str("name", g.p[idx].Name()).Msg("pre-run")
- if err := g.p[idx].PreRun(); err != nil {
+ if err := g.p[idx].PreRun(context.WithValue(ctx, common.ContextNodeRolesKey, rr)); err != nil {
return err
}
}
diff --git a/pkg/schema/metadata.go b/pkg/schema/metadata.go
index 6d20cd30..0b4cc94a 100644
--- a/pkg/schema/metadata.go
+++ b/pkg/schema/metadata.go
@@ -60,7 +60,7 @@ const (
// Group is the root node, allowing get resources from its sub nodes.
type Group interface {
GetSchema() *commonv1.Group
- StoreResource(resourceSchema ResourceSchema) (Resource, error)
+ StoreResource(ctx context.Context, resourceSchema ResourceSchema) (Resource, error)
LoadResource(name string) (Resource, bool)
}
@@ -296,7 +296,7 @@ func (sr *schemaRepo) storeResource(metadata *commonv1.Metadata) (Resource, erro
if err != nil {
return nil, errors.WithMessage(err, "fails to get the resource")
}
- return group.StoreResource(stm)
+ return group.StoreResource(context.Background(), stm)
}
func (sr *schemaRepo) deleteResource(metadata *commonv1.Metadata) error {
@@ -370,22 +370,24 @@ func (g *group) setDB(db tsdb.Database) {
g.db.Store(db)
}
-func (g *group) StoreResource(resourceSchema ResourceSchema) (Resource, error) {
+func (g *group) StoreResource(ctx context.Context, resourceSchema ResourceSchema) (Resource, error) {
g.mapMutex.Lock()
defer g.mapMutex.Unlock()
key := resourceSchema.GetMetadata().GetName()
preResource := g.schemaMap[key]
+ var localCtx context.Context
+ var cancel context.CancelFunc
if preResource != nil &&
resourceSchema.GetMetadata().GetModRevision() <= preResource.GetMetadata().GetModRevision() {
// we only need to check the max modifications revision observed for index rules
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- idxRules, errIndexRules := g.metadata.IndexRules(ctx, resourceSchema.GetMetadata())
+ localCtx, cancel = context.WithTimeout(ctx, 5*time.Second)
+ idxRules, errIndexRules := g.metadata.IndexRules(localCtx, resourceSchema.GetMetadata())
cancel()
if errIndexRules != nil {
return nil, errIndexRules
}
- ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
- topNAggrs, errTopN := g.metadata.MeasureRegistry().TopNAggregations(ctx, resourceSchema.GetMetadata())
+ localCtx, cancel = context.WithTimeout(ctx, 5*time.Second)
+ topNAggrs, errTopN := g.metadata.MeasureRegistry().TopNAggregations(localCtx, resourceSchema.GetMetadata())
cancel()
if errTopN != nil {
return nil, errTopN
@@ -397,18 +399,18 @@ func (g *group) StoreResource(resourceSchema ResourceSchema) (Resource, error) {
}
}
}
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ localCtx, cancel = context.WithTimeout(ctx, 5*time.Second)
defer cancel()
- idxRules, err := g.metadata.IndexRules(ctx, resourceSchema.GetMetadata())
+ idxRules, err := g.metadata.IndexRules(localCtx, resourceSchema.GetMetadata())
if err != nil {
return nil, err
}
var topNAggrs []*databasev1.TopNAggregation
if _, ok := resourceSchema.(*databasev1.Measure); ok {
- ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
+ localCtx, cancel = context.WithTimeout(ctx, 5*time.Second)
var innerErr error
- topNAggrs, innerErr = g.metadata.MeasureRegistry().TopNAggregations(ctx, resourceSchema.GetMetadata())
+ topNAggrs, innerErr = g.metadata.MeasureRegistry().TopNAggregations(localCtx, resourceSchema.GetMetadata())
cancel()
if innerErr != nil {
return nil, innerErr
diff --git a/pkg/signal/handler.go b/pkg/signal/handler.go
index 2fe89a22..1470485e 100644
--- a/pkg/signal/handler.go
+++ b/pkg/signal/handler.go
@@ -19,6 +19,7 @@
package signal
import (
+ "context"
"errors"
"fmt"
"os"
@@ -46,7 +47,7 @@ func (h *Handler) Name() string {
}
// PreRun implements run.PreRunner to initialize the handler.
-func (h *Handler) PreRun() error {
+func (h *Handler) PreRun(_ context.Context) error {
h.cancel = make(chan struct{})
h.signal = make(chan os.Signal, 1)
signal.Notify(h.signal,
diff --git a/pkg/test/matcher.go b/pkg/test/matcher.go
deleted file mode 100644
index b94fbb10..00000000
--- a/pkg/test/matcher.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Licensed to Apache Software Foundation (ASF) under one or more contributor
-// license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright
-// ownership. Apache Software Foundation (ASF) licenses this file to you under
-// the Apache License, Version 2.0 (the "License"); you may
-// not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package test
-
-import (
- "fmt"
-
- "go.uber.org/mock/gomock"
-
- databasev1 "github.com/apache/skywalking-banyandb/api/proto/banyandb/database/v1"
- "github.com/apache/skywalking-banyandb/pkg/bus"
-)
-
-var (
- _ gomock.Matcher = (*shardEventMatcher)(nil)
- _ gomock.Matcher = (*entityEventMatcher)(nil)
-)
-
-type shardEventMatcher struct {
- action databasev1.Action
-}
-
-// NewShardEventMatcher return a Matcher to comparing shard event's action.
-func NewShardEventMatcher(action databasev1.Action) gomock.Matcher {
- return &shardEventMatcher{
- action: action,
- }
-}
-
-func (s *shardEventMatcher) Matches(x interface{}) bool {
- if m, messageOk := x.(bus.Message); messageOk {
- if evt, dataOk := m.Data().(*databasev1.ShardEvent); dataOk {
- return evt.Action == s.action
- }
- }
-
- return false
-}
-
-func (s *shardEventMatcher) String() string {
- return fmt.Sprintf("shard-event-matcher(%s)", databasev1.Action_name[int32(s.action)])
-}
-
-type entityEventMatcher struct {
- action databasev1.Action
-}
-
-// NewEntityEventMatcher return a Matcher for comparing entity event's action.
-func NewEntityEventMatcher(action databasev1.Action) gomock.Matcher {
- return &entityEventMatcher{
- action: action,
- }
-}
-
-func (s *entityEventMatcher) Matches(x interface{}) bool {
- if m, messageOk := x.(bus.Message); messageOk {
- if evt, dataOk := m.Data().(*databasev1.EntityEvent); dataOk {
- return evt.Action == s.action
- }
- }
-
- return false
-}
-
-func (s *entityEventMatcher) String() string {
- return fmt.Sprintf("entity-event-matcher(%s)", databasev1.Action_name[int32(s.action)])
-}
diff --git a/pkg/test/measure/etcd.go b/pkg/test/measure/etcd.go
index 8abe58b5..18e48846 100644
--- a/pkg/test/measure/etcd.go
+++ b/pkg/test/measure/etcd.go
@@ -44,29 +44,29 @@ const (
var store embed.FS
// PreloadSchema loads schemas from files in the booting process.
-func PreloadSchema(e schema.Registry) error {
+func PreloadSchema(ctx context.Context, e schema.Registry) error {
if err := loadSchema(groupDir, &commonv1.Group{}, func(group *commonv1.Group) error {
- return e.CreateGroup(context.TODO(), group)
+ return e.CreateGroup(ctx, group)
}); err != nil {
return errors.WithStack(err)
}
if err := loadSchema(measureDir, &databasev1.Measure{}, func(measure *databasev1.Measure) error {
- return e.CreateMeasure(context.TODO(), measure)
+ return e.CreateMeasure(ctx, measure)
}); err != nil {
return errors.WithStack(err)
}
if err := loadSchema(indexRuleDir, &databasev1.IndexRule{}, func(indexRule *databasev1.IndexRule) error {
- return e.CreateIndexRule(context.TODO(), indexRule)
+ return e.CreateIndexRule(ctx, indexRule)
}); err != nil {
return errors.WithStack(err)
}
if err := loadSchema(indexRuleBindingDir, &databasev1.IndexRuleBinding{}, func(indexRuleBinding *databasev1.IndexRuleBinding) error {
- return e.CreateIndexRuleBinding(context.TODO(), indexRuleBinding)
+ return e.CreateIndexRuleBinding(ctx, indexRuleBinding)
}); err != nil {
return errors.WithStack(err)
}
if err := loadSchema(topNAggregationDir, &databasev1.TopNAggregation{}, func(topN *databasev1.TopNAggregation) error {
- return e.CreateTopNAggregation(context.TODO(), topN)
+ return e.CreateTopNAggregation(ctx, topN)
}); err != nil {
return errors.WithStack(err)
}
diff --git a/pkg/test/setup.go b/pkg/test/setup.go
index a684b646..9cc47b53 100644
--- a/pkg/test/setup.go
+++ b/pkg/test/setup.go
@@ -18,10 +18,12 @@
package test
import (
+ "context"
"sync"
"github.com/onsi/gomega"
+ "github.com/apache/skywalking-banyandb/api/common"
"github.com/apache/skywalking-banyandb/pkg/run"
)
@@ -40,7 +42,7 @@ func SetupModules(flags []string, units ...run.Unit) func() {
defer func() {
wg.Done()
}()
- errRun := g.Run()
+ errRun := g.Run(context.WithValue(context.Background(), common.ContextNodeIDKey, common.NodeID("test-node-id")))
gomega.Expect(errRun).ShouldNot(gomega.HaveOccurred())
}()
g.WaitTillReady()
diff --git a/pkg/test/setup/setup.go b/pkg/test/setup/setup.go
index 18070973..57ad2820 100644
--- a/pkg/test/setup/setup.go
+++ b/pkg/test/setup/setup.go
@@ -129,11 +129,11 @@ func (p *preloadService) Name() string {
return "preload-" + p.name
}
-func (p *preloadService) PreRun() error {
+func (p *preloadService) PreRun(ctx context.Context) error {
if p.name == "stream" {
- return test_stream.PreloadSchema(p.metaSvc.SchemaRegistry())
+ return test_stream.PreloadSchema(ctx, p.metaSvc.SchemaRegistry())
}
- return test_measure.PreloadSchema(p.metaSvc.SchemaRegistry())
+ return test_measure.PreloadSchema(ctx, p.metaSvc.SchemaRegistry())
}
func (p *preloadService) SetMeta(meta metadata.Service) {
diff --git a/pkg/test/stream/etcd.go b/pkg/test/stream/etcd.go
index 36ad9482..85c25d6f 100644
--- a/pkg/test/stream/etcd.go
+++ b/pkg/test/stream/etcd.go
@@ -43,12 +43,12 @@ var (
)
// PreloadSchema loads schemas from files in the booting process.
-func PreloadSchema(e schema.Registry) error {
+func PreloadSchema(ctx context.Context, e schema.Registry) error {
g := &commonv1.Group{}
if err := protojson.Unmarshal([]byte(groupJSON), g); err != nil {
return err
}
- if innerErr := e.CreateGroup(context.TODO(), g); innerErr != nil {
+ if innerErr := e.CreateGroup(ctx, g); innerErr != nil {
return innerErr
}
@@ -56,7 +56,7 @@ func PreloadSchema(e schema.Registry) error {
if unmarshalErr := protojson.Unmarshal([]byte(streamJSON), s); unmarshalErr != nil {
return unmarshalErr
}
- if innerErr := e.CreateStream(context.TODO(), s); innerErr != nil {
+ if innerErr := e.CreateStream(ctx, s); innerErr != nil {
return innerErr
}
@@ -64,7 +64,7 @@ func PreloadSchema(e schema.Registry) error {
if unmarshalErr := protojson.Unmarshal([]byte(indexRuleBindingJSON), indexRuleBinding); unmarshalErr != nil {
return unmarshalErr
}
- if innerErr := e.CreateIndexRuleBinding(context.TODO(), indexRuleBinding); innerErr != nil {
+ if innerErr := e.CreateIndexRuleBinding(ctx, indexRuleBinding); innerErr != nil {
return innerErr
}
@@ -82,7 +82,7 @@ func PreloadSchema(e schema.Registry) error {
if err != nil {
return err
}
- if innerErr := e.CreateIndexRule(context.TODO(), &idxRule); innerErr != nil {
+ if innerErr := e.CreateIndexRule(ctx, &idxRule); innerErr != nil {
return innerErr
}
}
diff --git a/test/stress/cases/istio/repo.go b/test/stress/cases/istio/repo.go
index 1b8006be..6f5fe011 100644
--- a/test/stress/cases/istio/repo.go
+++ b/test/stress/cases/istio/repo.go
@@ -139,7 +139,7 @@ func (p *preloadService) Name() string {
return "preload-" + p.name
}
-func (p *preloadService) PreRun() error {
+func (p *preloadService) PreRun(_ context.Context) error {
e := p.metaSvc.SchemaRegistry()
if err := loadSchema(groupDir, &commonv1.Group{}, func(group *commonv1.Group) error {
return e.CreateGroup(context.TODO(), group)