Skip to content

Commit 0ae84b1

Browse files
authored
Merge branch 'master' into improve-logs
2 parents 449f668 + 9b55771 commit 0ae84b1

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
* Massive changed log messages - those have more details now.
2+
* Fixed sometime panic on stats receive in query service
23

34
## v3.99.7
45
* Fixed not passing request context to topic event logs

internal/query/result.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func newResult(
169169

170170
r.lastPart = part
171171

172-
if r.statsCallback != nil {
172+
if part.GetExecStats() != nil && r.statsCallback != nil {
173173
r.statsCallback(stats.FromQueryStats(part.GetExecStats()))
174174
}
175175

internal/topic/topiclistenerinternal/stream_listener.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,16 +343,7 @@ func (l *streamListener) onStopPartitionRequest(
343343
return err
344344
}
345345

346-
var handlerCtx context.Context
347-
if session == nil {
348-
cancelledCtx, cancel := context.WithCancelCause(ctx)
349-
cancel(xerrors.WithStackTrace(xerrors.Wrap(errors.New(
350-
"ydb: partition on topic listener was force stopped: %w",
351-
))))
352-
handlerCtx = cancelledCtx
353-
} else {
354-
handlerCtx = session.Context()
355-
}
346+
handlerCtx := session.Context()
356347

357348
event := NewPublicStopPartitionSessionEvent(
358349
session.ToPublic(),

0 commit comments

Comments
 (0)