Skip to content

Conversation

@ydbot
Copy link
Collaborator

@ydbot ydbot commented Dec 4, 2025

Changelog entry

optionally change name of the storage metering schema

Changelog category

  • Not for changelog (changelog entry is not required)

Description for reviewers

Original PR(s)

Metadata

  • Original PR author(s): @ubyte
  • Cherry-picked by: @ubyte
  • Related issues: None

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-25-3-251204-123507
# 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 4089911 ===
Auto-merging ydb/core/protos/feature_flags.proto
CONFLICT (content): Merge conflict in ydb/core/protos/feature_flags.proto

error: could not apply 40899112e9a... optionally change name of the storage metering schema (#30080)
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
Copy link

github-actions bot commented Dec 4, 2025

2025-12-04 12:37:41 UTC Pre-commit check linux-x86_64-relwithdebinfo for 7c9441a has started.
2025-12-04 12:37:45 UTC Artifacts will be uploaded here
2025-12-04 12:41:46 UTC ya make is running...
🔴 2025-12-04 12:43:54 UTC Build failed, see the logs. Also see fail summary

@github-actions
Copy link

github-actions bot commented Dec 4, 2025

2025-12-04 12:37:42 UTC Pre-commit check linux-x86_64-release-asan for 7c9441a has started.
2025-12-04 12:38:19 UTC Artifacts will be uploaded here
2025-12-04 12:43:07 UTC ya make is running...
🔴 2025-12-04 12:45:24 UTC Build failed, see the logs. Also see fail summary

@github-actions
Copy link

github-actions bot commented Dec 4, 2025

🟢 2025-12-04 13:04:41 UTC The validation of the Pull Request description is successful.

@github-actions
Copy link

github-actions bot commented Dec 4, 2025

2025-12-04 12:53:40 UTC Pre-commit check linux-x86_64-release-asan for 896ff7d has started.
2025-12-04 12:53:55 UTC Artifacts will be uploaded here
2025-12-04 12:58:12 UTC ya make is running...
🟡 2025-12-04 16:03:47 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?
18118 17426 0 315 358 19

🟢 2025-12-04 16:05:17 UTC Build successful.
🟢 2025-12-04 16:05:40 UTC ydbd size 3.8 GiB changed* by +13.2 KiB, which is < 100.0 KiB vs stable-25-3: OK

ydbd size dash stable-25-3: 31b6296 merge: 896ff7d diff diff %
ydbd size 4 066 591 232 Bytes 4 066 604 792 Bytes +13.2 KiB +0.000%
ydbd stripped size 1 514 996 352 Bytes 1 514 999 680 Bytes +3.2 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
Copy link

github-actions bot commented Dec 4, 2025

2025-12-04 12:55:54 UTC Pre-commit check linux-x86_64-relwithdebinfo for 896ff7d has started.
2025-12-04 12:56:09 UTC Artifacts will be uploaded here
2025-12-04 13:00:13 UTC ya make is running...
🟡 2025-12-04 15:03:02 UTC Some tests failed, follow the links below. Going to retry failed tests...

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
41045 38368 0 6 2652 19

2025-12-04 15:06:19 UTC ya make is running... (failed tests rerun, try 2)
🟢 2025-12-04 15:23:45 UTC Tests successful.

Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
845 (only retried tests) 829 0 0 0 16

🟢 2025-12-04 15:23:55 UTC Build successful.
🟢 2025-12-04 15:24:11 UTC ydbd size 2.3 GiB changed* by +8.8 KiB, which is < 100.0 KiB vs stable-25-3: OK

ydbd size dash stable-25-3: 31b6296 merge: 896ff7d diff diff %
ydbd size 2 443 329 224 Bytes 2 443 338 264 Bytes +8.8 KiB +0.000%
ydbd stripped size 522 925 480 Bytes 522 926 248 Bytes +768 Bytes +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

@ubyte ubyte changed the title [CONFLICT] [Backport stable-25-3] PR #30080: optionally change name of the storage metering schema [Backport stable-25-3] PR #30080: optionally change name of the storage metering schema Dec 4, 2025
@ubyte ubyte marked this pull request as ready for review December 4, 2025 13:01
@ubyte ubyte requested a review from a team as a code owner December 4, 2025 13:01
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.

3 participants