Skip to content

Conversation

@ydbot
Copy link
Collaborator

@ydbot ydbot commented Dec 24, 2025

Changelog entry

lower priority for tablet metrics


refactoring: storing tablet metrics in a struct


batch tablet metrics processing: improve hive performance on large databases

Changelog category

  • New feature
  • Experimental feature
  • User Interface
  • Improvement
  • Performance improvement
  • Bugfix
  • Backward incompatible change
  • Documentation (changelog entry is not required)
  • Not for changelog (changelog entry is not required)

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-25-1-4-251224-102918
# 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 d77c4f4 ===
Auto-merging ydb/core/mind/hive/hive_impl.cpp
Auto-merging ydb/core/mind/hive/hive_ut.cpp
CONFLICT (content): Merge conflict in ydb/core/mind/hive/hive_ut.cpp

error: could not apply d77c4f49ac3... lower priority for tablet metrics (#28554)
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 e3ffe79 ===
Auto-merging ydb/core/mind/hive/drain.cpp
Auto-merging ydb/core/mind/hive/hive.cpp
CONFLICT (content): Merge conflict in ydb/core/mind/hive/hive.cpp
Auto-merging ydb/core/mind/hive/hive.h
Auto-merging ydb/core/mind/hive/hive_impl.cpp
Auto-merging ydb/core/mind/hive/hive_impl.h
Auto-merging ydb/core/mind/hive/monitoring.cpp
Auto-merging ydb/core/mind/hive/node_info.cpp
CONFLICT (content): Merge conflict in ydb/core/mind/hive/node_info.cpp
Auto-merging ydb/core/mind/hive/node_info.h
Auto-merging ydb/core/mind/hive/tablet_info.cpp
Auto-merging ydb/core/mind/hive/tablet_info.h
Auto-merging ydb/core/mind/hive/tx__update_tablet_metrics.cpp

error: could not apply e3ffe7944b9... refactoring: storing tablet metrics in a struct (#30181)
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 f8803a6 ===
Auto-merging ydb/core/mind/hive/hive_events.h
CONFLICT (content): Merge conflict in ydb/core/mind/hive/hive_events.h
Auto-merging ydb/core/mind/hive/hive_impl.cpp
CONFLICT (content): Merge conflict in ydb/core/mind/hive/hive_impl.cpp
Auto-merging ydb/core/mind/hive/hive_impl.h
CONFLICT (content): Merge conflict in ydb/core/mind/hive/hive_impl.h
Auto-merging ydb/core/mind/hive/tablet_info.h
CONFLICT (content): Merge conflict in ydb/core/mind/hive/tablet_info.h
Auto-merging ydb/core/mind/hive/tx__update_tablet_metrics.cpp
Auto-merging ydb/core/mind/hive/ya.make
Auto-merging ydb/core/protos/counters_hive.proto
CONFLICT (content): Merge conflict in ydb/core/protos/counters_hive.proto

error: could not apply f8803a6050a... batch tablet metrics processing (#30996)
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 24, 2025

🔴 2025-12-24 10:33:16 UTC The validation of the Pull Request description has failed. Please update the description.

Only one category can be selected at a time.

@ydbot
Copy link
Collaborator Author

ydbot commented Dec 24, 2025

Run Extra Tests

Run additional tests for this PR. You can customize:

  • Test Size: small, medium, large (default: all)
  • 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
Copy link

github-actions bot commented Dec 24, 2025

2025-12-24 10:36:31 UTC Pre-commit check linux-x86_64-relwithdebinfo for b55fa9a has started.
2025-12-24 10:37:05 UTC Artifacts will be uploaded here
2025-12-24 10:40:54 UTC ya make is running...
🔴 2025-12-24 10:43:17 UTC Build failed, see the logs. Also see fail summary

@github-actions
Copy link

github-actions bot commented Dec 24, 2025

2025-12-24 10:40:06 UTC Pre-commit check linux-x86_64-release-asan for b55fa9a has started.
2025-12-24 10:40:22 UTC Artifacts will be uploaded here
2025-12-24 10:43:50 UTC ya make is running...
🔴 2025-12-24 10:46:16 UTC Build failed, see the logs. Also see fail summary

@github-actions
Copy link

github-actions bot commented Dec 25, 2025

2025-12-25 01:51:40 UTC Pre-commit check linux-x86_64-relwithdebinfo for 2caabf2 has started.
2025-12-25 01:51:54 UTC Artifacts will be uploaded here
2025-12-25 01:55:18 UTC ya make is running...
🟡 2025-12-25 03:46:14 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?
35961 33423 0 8 2480 50

2025-12-25 03:46:24 UTC ya make is running... (failed tests rerun, try 2)
🟢 2025-12-25 04:07:14 UTC Tests successful.

Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
112 (only retried tests) 74 0 0 2 36

🟢 2025-12-25 04:07:17 UTC Build successful.
🟢 2025-12-25 04:07:37 UTC ydbd size 2.2 GiB changed* by -155.1 MiB, which is <= 0 Bytes vs main: OK

ydbd size dash main: 14437ea merge: 2caabf2 diff diff %
ydbd size 2 489 124 728 Bytes 2 326 451 072 Bytes -155.1 MiB -6.535%
ydbd stripped size 529 587 136 Bytes 487 537 088 Bytes -40.1 MiB -7.940%

*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 25, 2025

2025-12-25 01:51:43 UTC Pre-commit check linux-x86_64-release-asan for 2caabf2 has started.
2025-12-25 01:51:58 UTC Artifacts will be uploaded here
2025-12-25 01:55:13 UTC ya make is running...
🟡 2025-12-25 03:44:47 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet Going to retry failed tests...

Details

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
14861 14655 0 65 99 42

2025-12-25 03:44:52 UTC ya make is running... (failed tests rerun, try 2)
🟢 2025-12-25 04:04:59 UTC Tests successful.

Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
250 (only retried tests) 214 0 0 1 35

🟢 2025-12-25 04:05:01 UTC Build successful.
🟢 2025-12-25 04:05:31 UTC ydbd size 3.8 GiB changed* by -41.4 MiB, which is <= 0 Bytes vs main: OK

ydbd size dash main: 14437ea merge: 2caabf2 diff diff %
ydbd size 4 091 829 568 Bytes 4 048 446 840 Bytes -41.4 MiB -1.060%
ydbd stripped size 1 531 620 184 Bytes 1 410 041 848 Bytes -115.9 MiB -7.938%

*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.

3 participants