Skip to content

[Backport stable-26-2-1] PR #49452: [issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext - #50490

Open
ydbot wants to merge 2 commits into
stable-26-2-1from
cherry-pick-stable-26-2-1-260819-115457
Open

[Backport stable-26-2-1] PR #49452: [issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext#50490
ydbot wants to merge 2 commits into
stable-26-2-1from
cherry-pick-stable-26-2-1-260819-115457

Conversation

@ydbot

@ydbot ydbot commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator

Changelog entry

[issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext

Description for reviewers

Original PR(s)

Metadata

Conflicts Require Manual Resolution

This PR contains merge conflicts that require manual resolution.

Files with conflicts:

How to resolve conflicts:

git fetch origin
git checkout --track origin/cherry-pick-stable-26-2-1-260819-115457
# Resolve conflicts in files
git add .
git commit -m "Resolved merge conflicts"
git push

After resolving conflicts:

  1. Fix the PR title (remove [CONFLICT] if conflicts are resolved)
  2. Mark PR as ready for review

Git Cherry-Pick Log

=== Cherry-picking 709ca02 ===
Auto-merging ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.cpp
Auto-merging ydb/core/tx/columnshard/engines/reader/common_reader/iterator/source.cpp
Auto-merging ydb/core/tx/columnshard/engines/reader/common_reader/iterator/source.h
CONFLICT (modify/delete): ydb/tests/stability/tests/tsan.supp deleted in HEAD and modified in 709ca02856d ([issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext (#49452)).  Version 709ca02856d ([issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext (#49452)) of ydb/tests/stability/tests/tsan.supp left in tree.

error: could not apply 709ca02856d... [issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext (#49452)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

PR was created by cherry-pick workflow run

@github-actions

github-actions Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

2026-08-19 11:56:49 UTC Pre-commit check linux-x86_64-relwithdebinfo for fd74182 has started.
2026-08-19 11:57:31 UTC Artifacts will be uploaded here
2026-08-19 11:59:29 UTC ya make is running...
2026-08-19 12:14:36 UTC Check cancelled

@ydbot

ydbot commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator Author

Run Extra Tests

Run additional tests for this PR. You can customize:

  • Test Size: small, medium, large (default: small, medium)
  • Test Targets: any directory path (default: ydb/)
  • Sanitizers: ASAN, MSAN, TSAN
  • Coredumps: enable for debugging (default: off)
  • Additional args: custom ya make arguments

▶  Run tests

@github-actions

github-actions Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

2026-08-19 12:00:30 UTC Pre-commit check linux-x86_64-release-asan for fd74182 has started.
2026-08-19 12:00:50 UTC Artifacts will be uploaded here
2026-08-19 12:02:09 UTC ya make is running...
2026-08-19 12:14:39 UTC Check cancelled

@lberserq lberserq changed the title [CONFLICT] [Backport stable-26-2-1] PR #49452: [issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext [Backport stable-26-2-1] PR #49452: [issue-#49169] (-) Make prev-node tracing state lock-free in TExecutionContext Aug 19, 2026
@lberserq
lberserq marked this pull request as ready for review August 19, 2026 12:14
@lberserq
lberserq requested a review from a team as a code owner August 19, 2026 12:14
@lberserq

Copy link
Copy Markdown
Contributor

Conflict resolved: dropped the ydb/tests/stability/tests/tsan.supp hunk. That file does not exist on this stable branch (it is main-only and unreferenced by ydb/tests/stability/tests/ya.make), and the original PR only removed the now-obsolete race:SetPrevCategoryName suppression from it — there is nothing to backport.

The C++ part of the backport is byte-identical to the original commit 709ca02; all APIs it relies on (TCompiledGraph::GetNodes, IResourceProcessor::GetSignalCategoryName, TFetchingScriptCursor::GetPrevName returning by value) are unchanged on this branch.

@github-actions

github-actions Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

2026-08-19 12:16:09 UTC Pre-commit check linux-x86_64-release-asan for 8b56039 has started.
2026-08-19 12:16:26 UTC Artifacts will be uploaded here
2026-08-19 12:17:48 UTC ya make is running...
🟡 2026-08-19 14:09:50 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
19487 19420 0 36 30 1

🟢 2026-08-19 14:09:58 UTC Build successful.
🟢 2026-08-19 14:10:26 UTC ydbd size 4.1 GiB changed* by +11.2 KiB, which is < 100.0 KiB vs stable-26-2-1: OK

ydbd size dash stable-26-2-1: afd34b4 merge: 8b56039 diff diff %
ydbd size 4 409 097 504 Bytes 4 409 108 968 Bytes +11.2 KiB +0.000%
ydbd stripped size 1 655 598 688 Bytes 1 655 605 600 Bytes +6.8 KiB +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

@github-actions

github-actions Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

2026-08-19 12:16:12 UTC Pre-commit check linux-x86_64-relwithdebinfo for 8b56039 has started.
2026-08-19 12:16:31 UTC Artifacts will be uploaded here
2026-08-19 12:17:58 UTC ya make is running...
🟡 2026-08-19 14:44:11 UTC Some tests failed, follow the links below. Going to retry failed tests...

Details

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
50698 47237 0 3 3443 15

2026-08-19 14:44:44 UTC ya make is running... (failed tests rerun, try 2)
🟢 2026-08-19 14:48:15 UTC Tests successful.

Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
683 (only retried tests) 677 0 0 0 6

🟢 2026-08-19 14:48:38 UTC Build successful.
🟢 2026-08-19 14:49:00 UTC ydbd size 2.5 GiB changed* by +5.1 KiB, which is < 100.0 KiB vs stable-26-2-1: OK

ydbd size dash stable-26-2-1: afd34b4 merge: 8b56039 diff diff %
ydbd size 2 705 331 936 Bytes 2 705 337 168 Bytes +5.1 KiB +0.000%
ydbd stripped size 570 920 856 Bytes 570 923 480 Bytes +2.6 KiB +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants