Merge pull request #139 from ydb-platform/optout-dont-map-invoke-operation

no wrapping non-success operation results for use Connection as grpc.ClientConnInterface

Author: asmyasnikov

.github/workflows/tests.yml

@@ -173,4 +173,46 @@ jobs:
         with:
           file: ./scripting.txt
           flags: scripting,e2e,integration,${{ matrix.os }},${{ matrix.go-version }}
-          name: scripting
+          name: scripting
+  connection:
+    strategy:
+      matrix:
+        go-version: [1.17.x]
+        os: [ubuntu-latest]
+    services:
+      ydb:
+        image: cr.yandex/yc/yandex-docker-local-ydb:latest
+        ports:
+          - 2135:2135
+          - 8765:8765
+        volumes:
+          - /tmp/ydb_certs:/ydb_certs
+        env:
+          YDB_LOCAL_SURVIVE_RESTART: true
+          YDB_USE_IN_MEMORY_PDISKS: true
+        options: '-h localhost'
+    env:
+      OS: ${{ matrix.os }}
+      GO: ${{ matrix.go-version }}
+      YDB_CONNECTION_STRING: grpcs://localhost:2135/?database=/local
+      YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
+      YDB_ANONYMOUS_CREDENTIALS: 1
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Test
+        run: go test -race -coverpkg=./... -coverprofile connection.txt -covermode atomic ./test/connection_test.go
+      - name: Clear report
+        run: sed -i '/testutil\|trace\|test/d' connection.txt
+        shell: bash
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v2
+        with:
+          file: ./connection.txt
+          flags: connection,e2e,integration,${{ matrix.os }},${{ matrix.go-version }}
+          name: connection

CHANGELOG.md

@@ -7,6 +7,8 @@
 * Added removing `conn.Conn` from `conn.Pool` on `conn.Conn.Close()` call
 * Checked cluster close/empty on keeper goroutine
 * Fixed `internal.errors.New` wrapping depth
+* Added context flag for no wrapping operation results as error
+* Refactored `trace.Driver` conn events
 
 ## 3.11.7
 * Removed internal alias-type `errors.IssuesIterator`

connection.go

@@ -14,6 +14,7 @@ import (
 	discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/discovery/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/single"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/lazy"
@@ -136,11 +137,13 @@ func (c *connection) Invoke(
 	reply interface{},
 	opts ...grpc.CallOption,
 ) (err error) {
-	err = c.db.Invoke(ctx, method, args, reply, opts...)
-	if err != nil {
-		err = errors.Errorf(0, "invoke failed: %w", err)
-	}
-	return err
+	return c.db.Invoke(
+		conn.WithoutWrapping(ctx),
+		method,
+		args,
+		reply,
+		opts...,
+	)
 }
 
 func (c *connection) NewStream(
@@ -149,7 +152,12 @@ func (c *connection) NewStream(
 	method string,
 	opts ...grpc.CallOption,
 ) (grpc.ClientStream, error) {
-	return c.db.NewStream(ctx, desc, method, opts...)
+	return c.db.NewStream(
+		conn.WithoutWrapping(ctx),
+		desc,
+		method,
+		opts...,
+	)
 }
 
 func (c *connection) Endpoint() string {

internal/balancer/stub/stub.go

@@ -44,7 +44,7 @@ func Balancer() (*list.List, balancer.Balancer) {
 		},
 		OnPessimize: func(ctx context.Context, x balancer.Element) error {
 			e := x.(*list.Element)
-			e.Conn.SetState(ctx, conn.Banned)
+			e.Conn.SetState(conn.Banned)
 			return nil
 		},
 		OnContains: func(x balancer.Element) bool {

internal/balancer/test/balancer_test.go

@@ -1,7 +1,6 @@
 package test
 
 import (
-	"context"
 	"net"
 	"strconv"
 	"testing"
@@ -469,8 +468,6 @@ var testData = [...]struct {
 func TestRoundRobin(t *testing.T) {
 	for _, test := range testData {
 		t.Run(test.name, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
 			var (
 				mconn = map[conn.Conn]string{} // Conn to addr mapping for easy matching.
 				maddr = map[string]conn.Conn{} // addr to Conn mapping.
@@ -486,10 +483,10 @@ func TestRoundRobin(t *testing.T) {
 						config.WithEndpoint("test"),
 					),
 				)
-				c.SetState(ctx, conn.Online)
+				c.SetState(conn.Online)
 				if test.banned != nil {
 					if _, ok := test.banned[e.Address()]; ok {
-						c.SetState(ctx, conn.Banned)
+						c.SetState(conn.Banned)
 					}
 				}
 				mconn[c] = e.Address()
@@ -529,8 +526,6 @@ func TestRandomChoice(t *testing.T) {
 	multiplier := 100
 	for _, test := range testData {
 		t.Run(test.name, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
 			var (
 				mconn = map[conn.Conn]string{} // Conn to addr mapping for easy matching.
 				maddr = map[string]conn.Conn{} // addr to Conn mapping.
@@ -543,9 +538,9 @@ func TestRandomChoice(t *testing.T) {
 					e,
 					config.New(),
 				)
-				c.SetState(ctx, conn.Online)
+				c.SetState(conn.Online)
 				if _, ok := test.banned[e.Address()]; ok {
-					c.SetState(ctx, conn.Banned)
+					c.SetState(conn.Banned)
 				}
 				mconn[c] = e.Address()
 				maddr[e.Address()] = c

internal/cluster/cluster.go

@@ -385,7 +385,7 @@ func (c *cluster) Pessimize(ctx context.Context, e endpoint.Endpoint) (err error
 	if !c.balancer.Contains(entry.Handle) {
 		return errors.Errorf(0, "cluster: pessimize failed: %w", ErrUnknownBalancerElement)
 	}
-	entry.Conn.SetState(ctx, conn.Banned)
+	entry.Conn.SetState(conn.Banned)
 	if c.explorer != nil {
 		// count ratio (banned/all)
 		online := 0