From c7bb99e57c88851600557502776a490cda607133 Mon Sep 17 00:00:00 2001 From: sashayakovtseva Date: Mon, 11 Mar 2024 15:50:12 +0300 Subject: [PATCH 1/2] List database contents as a ping Signed-off-by: sashayakovtseva --- internal/datastore/ydb/ydb.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/datastore/ydb/ydb.go b/internal/datastore/ydb/ydb.go index 84de141f38..c7815a3574 100644 --- a/internal/datastore/ydb/ydb.go +++ b/internal/datastore/ydb/ydb.go @@ -3,6 +3,7 @@ package ydb import ( "context" "fmt" + "os" "sync" "sync/atomic" "time" @@ -13,6 +14,7 @@ import ( ydbPrometheus "github.com/ydb-platform/ydb-go-sdk-prometheus" ydbZerolog "github.com/ydb-platform/ydb-go-sdk-zerolog" "github.com/ydb-platform/ydb-go-sdk/v3" + ydbLog "github.com/ydb-platform/ydb-go-sdk/v3/log" "github.com/ydb-platform/ydb-go-sdk/v3/table" "github.com/ydb-platform/ydb-go-sdk/v3/trace" "go.opentelemetry.io/otel" @@ -77,6 +79,7 @@ func newYDBDatastore(ctx context.Context, dsn string, opts ...Option) (*ydbDatas ydbOpts := []ydb.Option{ ydbZerolog.WithTraces(&log.Logger, trace.DatabaseSQLEvents), ydbOtel.WithTraces(), + ydb.WithLogger(ydbLog.Default(os.Stderr, ydbLog.WithMinLevel(ydbLog.TRACE)), trace.DetailsAll), } if config.enablePrometheusStats { ydbOpts = append(ydbOpts, ydbPrometheus.WithTraces(prometheus.DefaultRegisterer)) @@ -90,7 +93,7 @@ func newYDBDatastore(ctx context.Context, dsn string, opts ...Option) (*ydbDatas return nil, fmt.Errorf("failed to open YDB connection: %w", err) } - if _, err := db.Scheme().ListDirectory(ctx, config.tablePathPrefix); err != nil { + if _, err := db.Scheme().ListDirectory(ctx, db.Name()); err != nil { return nil, fmt.Errorf("failed to ping YDB: %w", err) } From 802224b0529e1d9da8df29c8d50cdab6e10f732d Mon Sep 17 00:00:00 2001 From: sashayakovtseva Date: Mon, 11 Mar 2024 15:50:56 +0300 Subject: [PATCH 2/2] Remove debug Signed-off-by: sashayakovtseva --- internal/datastore/ydb/ydb.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/datastore/ydb/ydb.go b/internal/datastore/ydb/ydb.go index c7815a3574..097d9e45b8 100644 --- a/internal/datastore/ydb/ydb.go +++ b/internal/datastore/ydb/ydb.go @@ -3,7 +3,6 @@ package ydb import ( "context" "fmt" - "os" "sync" "sync/atomic" "time" @@ -14,7 +13,6 @@ import ( ydbPrometheus "github.com/ydb-platform/ydb-go-sdk-prometheus" ydbZerolog "github.com/ydb-platform/ydb-go-sdk-zerolog" "github.com/ydb-platform/ydb-go-sdk/v3" - ydbLog "github.com/ydb-platform/ydb-go-sdk/v3/log" "github.com/ydb-platform/ydb-go-sdk/v3/table" "github.com/ydb-platform/ydb-go-sdk/v3/trace" "go.opentelemetry.io/otel" @@ -79,7 +77,6 @@ func newYDBDatastore(ctx context.Context, dsn string, opts ...Option) (*ydbDatas ydbOpts := []ydb.Option{ ydbZerolog.WithTraces(&log.Logger, trace.DatabaseSQLEvents), ydbOtel.WithTraces(), - ydb.WithLogger(ydbLog.Default(os.Stderr, ydbLog.WithMinLevel(ydbLog.TRACE)), trace.DetailsAll), } if config.enablePrometheusStats { ydbOpts = append(ydbOpts, ydbPrometheus.WithTraces(prometheus.DefaultRegisterer))