Merge pull request #182 from ydb-platform/local-dc

replace cluster.Update to cluster.Remove + cluster.Insert

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,11 @@
+* Refactored `cluster.Cluster` and `balancer.Balancer` interfaces (removed `Update` method)
+* Replaced `cluster.Update` with `cluster.Remove` and `cluster.Insert` calls
+* Removed `trace.Driver.OnClusterUpdate` event
+* Fixed bug with unexpected changing of local datacenter flag in endpoint
+* Refactored errors wrapping (stackedError are not ydb error now, checking `errors.IsYdb(err)` with `errors.As` now)
+* Wrapped retry operation errors with `errors.WithStackTrace(err)`
+* Changed `trace.RetryLoopStartInfo.Context` type from `context.Context` to `*context.Context`
+
 ## v3.16.9
 * Refactored internal operation and transport errors
 

balancers/config_test.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 )
 
 type testBalancer struct{}
@@ -22,7 +21,7 @@ func (t testBalancer) Insert(conn conn.Conn) balancer.Element {
 	panic("unexpected call")
 }
 
-func (t testBalancer) Update(element balancer.Element, info info.Info) {
+func (t testBalancer) Update(element balancer.Element) {
 	panic("unexpected call")
 }
 

internal/balancer/balancer.go

@@ -2,7 +2,6 @@ package balancer
 
 import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 )
 
 // Element is an empty interface that holds some Balancer specific data.
@@ -21,9 +20,6 @@ type Balancer interface {
 	// Insert inserts new connection.
 	Insert(conn.Conn) Element
 
-	// Update updates previously inserted connection.
-	Update(Element, info.Info)
-
 	// Remove removes previously inserted connection.
 	Remove(Element) bool
 

internal/balancer/list/list.go

@@ -2,13 +2,11 @@ package list
 
 import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 )
 
 type Element struct {
 	Index int
 	Conn  conn.Conn
-	Info  info.Info
 }
 
 type List []*Element
@@ -17,12 +15,6 @@ func (cs *List) Insert(cc conn.Conn) *Element {
 	e := &Element{
 		Index: len(*cs),
 		Conn:  cc,
-		Info: info.Info{
-			Address:    cc.Endpoint().Address(),
-			ID:         cc.Endpoint().NodeID(),
-			LoadFactor: cc.Endpoint().LoadFactor(),
-			Local:      cc.Endpoint().LocalDC(),
-		},
 	}
 	*cs = append(*cs, e)
 	return e

internal/balancer/multi/multi.go

@@ -3,7 +3,6 @@ package multi
 import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 )
 
 func Balancer(opts ...Option) balancer.Balancer {
@@ -82,14 +81,6 @@ func (m *multi) Insert(conn conn.Conn) balancer.Element {
 	return nil
 }
 
-func (m *multi) Update(x balancer.Element, info info.Info) {
-	for i, h := range x.(multiHandle).elements {
-		if h != nil {
-			m.balancer[i].Update(h, info)
-		}
-	}
-}
-
 func (m *multi) Remove(x balancer.Element) (removed bool) {
 	for i, h := range x.(multiHandle).elements {
 		if h != nil {

internal/balancer/rr/rr.go

@@ -9,7 +9,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/list"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/rand"
 )
 
@@ -80,17 +79,10 @@ func (r *roundRobin) Insert(conn conn.Conn) balancer.Element {
 	return e
 }
 
-func (r *roundRobin) Update(el balancer.Element, info info.Info) {
-	e := el.(*list.Element)
-	e.Info = info
-	r.updateMinMax(e.Conn)
-	r.belt = r.distribute()
-}
-
 func (r *roundRobin) Remove(x balancer.Element) bool {
 	el := x.(*list.Element)
 	r.conns.Remove(el)
-	r.inspectMinMax(el.Info)
+	r.inspectMinMax(el.Conn.Endpoint().LoadFactor())
 	r.belt = r.distribute()
 	return true
 }
@@ -120,13 +112,13 @@ func (r *roundRobin) updateMinMax(cc conn.Conn) {
 	}
 }
 
-func (r *roundRobin) inspectMinMax(info info.Info) {
-	if r.min != info.LoadFactor && r.max != info.LoadFactor {
+func (r *roundRobin) inspectMinMax(loadFactor float32) {
+	if r.min != loadFactor && r.max != loadFactor {
 		return
 	}
 	var def bool
 	for _, x := range r.conns {
-		load := x.Info.LoadFactor
+		load := x.Conn.Endpoint().LoadFactor()
 		if !def {
 			r.min = load
 			r.max = load
@@ -156,7 +148,7 @@ func (r *roundRobin) spread(f func(float32) int32) []int {
 	fill := func(state conn.State) (filled bool) {
 		for _, x := range r.conns {
 			if x.Conn.GetState() == state {
-				d := f(x.Info.LoadFactor)
+				d := f(x.Conn.Endpoint().LoadFactor())
 				dist = append(dist, d)
 				index = append(index, x.Index)
 				filled = true

internal/balancer/single/single.go

@@ -3,7 +3,6 @@ package single
 import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 )
 
 func Balancer() balancer.Balancer {
@@ -22,6 +21,10 @@ func (b *single) Next() conn.Conn {
 	return b.conn
 }
 
+func (b *single) Conn() conn.Conn {
+	return b.conn
+}
+
 func (b *single) Insert(conn conn.Conn) balancer.Element {
 	if b.conn != nil {
 		panic("ydb: single Conn Balancer: double Insert()")
@@ -38,8 +41,6 @@ func (b *single) Remove(x balancer.Element) bool {
 	return true
 }
 
-func (b *single) Update(balancer.Element, info.Info) {}
-
 func (b *single) Contains(x balancer.Element) bool {
 	if x == nil {
 		return false

internal/balancer/stub/stub.go

@@ -6,13 +6,11 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/list"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 )
 
 type stubBalancer struct {
 	OnNext      func() conn.Conn
 	OnInsert    func(conn.Conn) balancer.Element
-	OnUpdate    func(balancer.Element, info.Info)
 	OnRemove    func(balancer.Element) bool
 	OnPessimize func(context.Context, balancer.Element) error
 	OnContains  func(balancer.Element) bool
@@ -40,10 +38,6 @@ func Balancer() (*list.List, balancer.Balancer) {
 			cs.Remove(e)
 			return true
 		},
-		OnUpdate: func(x balancer.Element, info info.Info) {
-			e := x.(*list.Element)
-			e.Info = info
-		},
 		OnPessimize: func(ctx context.Context, x balancer.Element) error {
 			e := x.(*list.Element)
 			e.Conn.SetState(conn.Banned)
@@ -77,12 +71,6 @@ func (s stubBalancer) Insert(c conn.Conn) balancer.Element {
 	return nil
 }
 
-func (s stubBalancer) Update(el balancer.Element, i info.Info) {
-	if f := s.OnUpdate; f != nil {
-		f(el, i)
-	}
-}
-
 func (s stubBalancer) Remove(el balancer.Element) bool {
 	if f := s.OnRemove; f != nil {
 		return f(el)

internal/balancer/test/balancer_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/stub"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint/info"
 )
 
 func isEvenConn(c conn.Conn) bool {
@@ -39,10 +38,10 @@ func TestMulti(t *testing.T) {
 		it(cs1)
 		it(cs2)
 	}
-	forEachConn := func(it func(conn.Conn, info.Info)) {
+	forEachConn := func(it func(conn.Conn)) {
 		forEachList(func(cs *list.List) {
 			for _, e := range *cs {
-				it(e.Conn, e.Info)
+				it(e.Conn)
 			}
 		})
 	}
@@ -52,6 +51,7 @@ func TestMulti(t *testing.T) {
 	)
 	const n = 100
 	var (
+		cc = make([]conn.Conn, n)
 		es = make([]balancer.Element, n)
 		el = make(map[conn.Conn]balancer.Element, n)
 	)
@@ -60,6 +60,7 @@ func TestMulti(t *testing.T) {
 		e := m.Insert(c)
 		es[i] = e
 		el[c] = e
+		cc[i] = c
 	}
 	forEachList(func(cs *list.List) {
 		if act, exp := len(*cs), n/2; act != exp {
@@ -70,12 +71,10 @@ func TestMulti(t *testing.T) {
 		}
 	})
 	for i := 0; i < n; i++ {
-		m.Update(es[i], info.Info{
-			LoadFactor: 1,
-		})
+		cc[i].Endpoint().Touch(endpoint.WithLoadFactor(1))
 	}
-	forEachConn(func(conn conn.Conn, info info.Info) {
-		if act, exp := info.LoadFactor, float32(1); act != exp {
+	forEachConn(func(conn conn.Conn) {
+		if act, exp := conn.Endpoint().LoadFactor(), float32(1); act != exp {
 			t.Errorf(
 				"unexpected load factor: %f; want %f",
 				act, exp,