Skip to content

Commit 3def68b

Browse files
asmyasnikovasmyasnikov
committed
* Removed trace.Driver.OnClusterUpdate event
1 parent c8cf840 commit 3def68b

File tree

6 files changed

+33
-106
lines changed

6 files changed

+33
-106
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
* Refactored `cluster.Cluster` and `balancer.Balancer` interfaces (removed `Update` method)
22
* Replaced `cluster.Update` with `cluster.Remove` and `cluster.Insert` calls
3+
* Removed `trace.Driver.OnClusterUpdate` event
34
* Fixed bug with unexpected changing of local datacenter flag in endpoint
45
* Refactored errors wrapping (stackedError are not ydb error now, checking `errors.IsYdb(err)` with `errors.As` now)
56

‎log/driver.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -471,20 +471,6 @@ func Driver(log Logger, details trace.Details) (t trace.Driver) {
471471
)
472472
}
473473
}
474-
t.OnClusterUpdate = func(info trace.DriverClusterUpdateStartInfo) func(trace.DriverClusterUpdateDoneInfo) {
475-
endpoint := info.Endpoint.String()
476-
log.Debugf(`update start {endpoint:%v}`,
477-
endpoint,
478-
)
479-
start := time.Now()
480-
return func(info trace.DriverClusterUpdateDoneInfo) {
481-
log.Infof(`update done {endpoint:%v,latency:"%v",state:"%s"}`,
482-
endpoint,
483-
time.Since(start),
484-
info.State,
485-
)
486-
}
487-
}
488474
t.OnPessimizeNode = func(info trace.DriverPessimizeNodeStartInfo) func(trace.DriverPessimizeNodeDoneInfo) {
489475
endpoint := info.Endpoint.String()
490476
log.Warnf(`pessimize start {endpoint:%v,cause:"%s"}`,

‎log/retry.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package log
33
import (
44
"time"
55

6+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
67
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
78
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
89
)
@@ -29,12 +30,12 @@ func Retry(l Logger, details trace.Details) (t trace.Retry) {
2930
time.Since(start),
3031
)
3132
} else {
32-
log := l.Warnf
33-
m := retry.Check(info.Error)
34-
if m.StatusCode() < 0 {
35-
log = l.Debugf
33+
f := l.Errorf
34+
if !errors.IsYdb(info.Error) {
35+
f = l.Debugf
3636
}
37-
log(`retry attempt failed {id:"%s",latency:"%v",error:"%s",retryable:%v,code:%d,deleteSession:%v}`,
37+
m := retry.Check(info.Error)
38+
f(`retry attempt failed {id:"%s",latency:"%v",error:"%s",retryable:%v,code:%d,deleteSession:%v}`,
3839
id,
3940
time.Since(start),
4041
info.Error,
@@ -51,12 +52,12 @@ func Retry(l Logger, details trace.Details) (t trace.Retry) {
5152
info.Attempts,
5253
)
5354
} else {
54-
log := l.Errorf
55-
m := retry.Check(info.Error)
56-
if m.StatusCode() < 0 {
57-
log = l.Debugf
55+
f := l.Errorf
56+
if !errors.IsYdb(info.Error) {
57+
f = l.Debugf
5858
}
59-
log(`retry failed {id:"%s",latency:"%v",attempts:%v,error:"%s",retryable:%v,code:%d,deleteSession:%v}`,
59+
m := retry.Check(info.Error)
60+
f(`retry failed {id:"%s",latency:"%v",attempts:%v,error:"%s",retryable:%v,code:%d,deleteSession:%v}`,
6061
id,
6162
time.Since(start),
6263
info.Attempts,

‎log/table.go‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package log
33
import (
44
"time"
55

6+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
67
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
78
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
89
)
@@ -32,12 +33,12 @@ func Table(l Logger, details trace.Details) (t trace.Table) {
3233
idempotent,
3334
)
3435
} else {
35-
log := l.Warnf
36-
m := retry.Check(info.Error)
37-
if m.StatusCode() < 0 {
38-
log = l.Debugf
36+
f := l.Warnf
37+
if !errors.IsYdb(info.Error) {
38+
f = l.Debugf
3939
}
40-
log(`do attempt failed {latency:"%v",idempotent:%t,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
40+
m := retry.Check(info.Error)
41+
f(`do attempt failed {latency:"%v",idempotent:%t,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
4142
time.Since(start),
4243
idempotent,
4344
info.Error,
@@ -54,12 +55,12 @@ func Table(l Logger, details trace.Details) (t trace.Table) {
5455
info.Attempts,
5556
)
5657
} else {
57-
log := l.Errorf
58-
m := retry.Check(info.Error)
59-
if m.StatusCode() < 0 {
60-
log = l.Debugf
58+
f := l.Errorf
59+
if !errors.IsYdb(info.Error) {
60+
f = l.Debugf
6161
}
62-
log(`do failed {latency:"%v",idempotent:%t,attempts:%d,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
62+
m := retry.Check(info.Error)
63+
f(`do failed {latency:"%v",idempotent:%t,attempts:%d,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
6364
time.Since(start),
6465
idempotent,
6566
info.Attempts,
@@ -91,12 +92,12 @@ func Table(l Logger, details trace.Details) (t trace.Table) {
9192
idempotent,
9293
)
9394
} else {
94-
log := l.Warnf
95-
m := retry.Check(info.Error)
96-
if m.StatusCode() < 0 {
97-
log = l.Debugf
95+
f := l.Warnf
96+
if !errors.IsYdb(info.Error) {
97+
f = l.Debugf
9898
}
99-
log(`doTx attempt failed {latency:"%v",idempotent:%t,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
99+
m := retry.Check(info.Error)
100+
f(`doTx attempt failed {latency:"%v",idempotent:%t,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
100101
time.Since(start),
101102
idempotent,
102103
info.Error,
@@ -113,12 +114,12 @@ func Table(l Logger, details trace.Details) (t trace.Table) {
113114
info.Attempts,
114115
)
115116
} else {
116-
log := l.Errorf
117-
m := retry.Check(info.Error)
118-
if m.StatusCode() < 0 {
119-
log = l.Debugf
117+
f := l.Warnf
118+
if !errors.IsYdb(info.Error) {
119+
f = l.Debugf
120120
}
121-
log(`doTx failed {latency:"%v",idempotent:%t,attempts:%d,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
121+
m := retry.Check(info.Error)
122+
f(`doTx failed {latency:"%v",idempotent:%t,attempts:%d,error:"%s",retryable:%t,code:%d,deleteSession:%t}`,
122123
time.Since(start),
123124
idempotent,
124125
info.Attempts,

‎trace/driver.go‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ type (
5050
OnClusterClose func(DriverClusterCloseStartInfo) func(DriverClusterCloseDoneInfo)
5151
OnClusterGet func(DriverClusterGetStartInfo) func(DriverClusterGetDoneInfo)
5252
OnClusterInsert func(DriverClusterInsertStartInfo) func(DriverClusterInsertDoneInfo)
53-
OnClusterUpdate func(DriverClusterUpdateStartInfo) func(DriverClusterUpdateDoneInfo)
5453
OnClusterRemove func(DriverClusterRemoveStartInfo) func(DriverClusterRemoveDoneInfo)
5554
OnPessimizeNode func(DriverPessimizeNodeStartInfo) func(DriverPessimizeNodeDoneInfo)
5655

@@ -124,17 +123,6 @@ type (
124123
Inserted bool
125124
State ConnState
126125
}
127-
DriverClusterUpdateStartInfo struct {
128-
// Context make available context in trace callback function.
129-
// Pointer to context provide replacement of context in trace callback function.
130-
// Warning: concurrent access to pointer on client side must be excluded.
131-
// Safe replacement of context are provided only inside callback function
132-
Context *context.Context
133-
Endpoint EndpointInfo
134-
}
135-
DriverClusterUpdateDoneInfo struct {
136-
State ConnState
137-
}
138126
DriverClusterRemoveStartInfo struct {
139127
// Context make available context in trace callback function.
140128
// Pointer to context provide replacement of context in trace callback function.

‎trace/driver_gtrace.go‎

Lines changed: 0 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)