Skip to content

[CONFLICT] [Backport stable-26-3-1] PR #47770: some decommission fixes, PR #48893: fix a crash on a tablet stuck in group assignment - #50466

Draft
ydbot wants to merge 2 commits into
stable-26-3-1from
cherry-pick-stable-26-3-1-260819-084649
Draft

[CONFLICT] [Backport stable-26-3-1] PR #47770: some decommission fixes, PR #48893: fix a crash on a tablet stuck in group assignment#50466
ydbot wants to merge 2 commits into
stable-26-3-1from
cherry-pick-stable-26-3-1-260819-084649

Conversation

@ydbot

@ydbot ydbot commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator

Changelog entry

some decommission fixes


fix a crash on a tablet stuck in group assignment

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-3-1-260819-084649
# 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 21ba0d6 ===
Auto-merging ydb/core/cms/console/console_tenants_manager.cpp
Auto-merging ydb/core/mind/hive/hive_impl.cpp
CONFLICT (content): Merge conflict in ydb/core/mind/hive/hive_impl.cpp
CONFLICT (modify/delete): ydb/tests/functional/tenants/test_remove_storage_groups.py deleted in HEAD and modified in 21ba0d623a2 (some decommission fixes (#47770)).  Version 21ba0d623a2 (some decommission fixes (#47770)) of ydb/tests/functional/tenants/test_remove_storage_groups.py left in tree.

error: could not apply 21ba0d623a2... some decommission fixes (#47770)
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".

=== Cherry-picking b54d51f ===
Auto-merging ydb/core/mind/hive/hive_impl.cpp
Auto-merging ydb/core/mind/hive/hive_ut.cpp
[cherry-pick-stable-26-3-1-260819-084649 3b2dd868a76] fix a crash on a tablet stuck in group assignment (#48893)
 Author: vporyadke <zalyalov@ydb.tech>
 Date: Wed Aug 5 14:48:44 2026 +0200
 2 files changed, 10 insertions(+), 1 deletion(-)

PR was created by cherry-pick workflow run

vporyadke and others added 2 commits August 19, 2026 08:47
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@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 08:50:45 UTC Pre-commit check linux-x86_64-relwithdebinfo for ebb7958 has started.
2026-08-19 08:53:32 UTC Artifacts will be uploaded here
2026-08-19 08:55:25 UTC ya make is running...
🔴 2026-08-19 09:01:23 UTC Build failed, see the logs. Also see fail summary

@github-actions

github-actions Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

2026-08-19 08:53:00 UTC Pre-commit check linux-x86_64-release-asan for ebb7958 has started.
2026-08-19 08:53:19 UTC Artifacts will be uploaded here
2026-08-19 08:54:45 UTC ya make is running...
🔴 2026-08-19 08:58:22 UTC Build failed, see the logs. Also see fail summary

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