You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Fix the PR title (remove [CONFLICT] if conflicts are resolved)
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".
⚪ 2026-08-19 11:56:49 UTC Pre-commit checklinux-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
⚪ 2026-08-19 12:00:30 UTC Pre-commit checklinux-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
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
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.
⚪ 2026-08-19 12:16:09 UTC Pre-commit checklinux-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
🟢 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
⚪ 2026-08-19 12:16:12 UTC Pre-commit checklinux-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...
🟢 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
*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
After resolving conflicts:
[CONFLICT]if conflicts are resolved)Git Cherry-Pick Log
PR was created by cherry-pick workflow run