Skip to content

branch-4.1: [pick] Cherry-pick #60520 #60239 #60310#61921

Merged
yiguolei merged 6 commits intoapache:branch-4.1from
Yukang-Lian:combined-picks-branch-4.1
Apr 1, 2026
Merged

branch-4.1: [pick] Cherry-pick #60520 #60239 #60310#61921
yiguolei merged 6 commits intoapache:branch-4.1from
Yukang-Lian:combined-picks-branch-4.1

Conversation

@Yukang-Lian
Copy link
Copy Markdown
Collaborator

Proposed changes

Cherry-pick the following PRs to branch-4.1:

…0520)

- Add dedicated bvar metrics for the recycle_operation_logs path, which
previously had no observability through the monitoring system
- Introduce OplogRecycleStats to track per-round recycling statistics
including skipped-by-snapshot count, earliest recyclable version,
failure count, and generated recycle key counts
(partition/index/rowset/txn)
- Add scan_and_statistics_operation_logs() to collect pre-recycling
statistics via RecyclerMetricsContext, consistent with existing
scan_and_statistics_* functions
- Use a PendingCounts pattern in OperationLogRecycler to avoid inflating
committed metrics on transaction failure — local counts are only merged
into OplogRecycleStats atomics after successful
commit()
- All new statistics are gated behind the enable_recycler_stats_metrics
config flag
…apache#60239)

Cluster snapshot operations are currently restricted to root user only.
Some customers need to allow ADMIN users to manage cluster snapshots
without granting root access.
Solution
Add a new configuration cluster_snapshot_min_privilege to control the
minimum privilege level:
- root (default): Only root user can execute
- admin: Users with ADMIN privilege can execute
Affects 4 cluster snapshot commands and 2 information_schema tables
(cluster_snapshots, cluster_snapshot_properties).
@Yukang-Lian Yukang-Lian requested a review from yiguolei as a code owner March 31, 2026 04:13
@Thearas
Copy link
Copy Markdown
Contributor

Thearas commented Mar 31, 2026

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

…estamps instead of enable_force_write_int96_timestamps
@Yukang-Lian
Copy link
Copy Markdown
Collaborator Author

run buildall

@hello-stephen
Copy link
Copy Markdown
Contributor

Cloud UT Coverage Report

Increment line coverage 75.78% (122/161) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 78.64% (1793/2280)
Line Coverage 64.43% (32260/50070)
Region Coverage 65.30% (16138/24715)
Branch Coverage 55.79% (8605/15424)

…h-4.1

- Fix missing ImmutableMap import in AdminCreateClusterSnapshotCommandTest
- Fix header path: olap/tablet_meta.h -> storage/tablet/tablet_meta.h in cloud_cluster_info_test
@Yukang-Lian
Copy link
Copy Markdown
Collaborator Author

run buildall

@doris-robot
Copy link
Copy Markdown

Cloud UT Coverage Report

Increment line coverage 75.78% (122/161) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 78.66% (1795/2282)
Line Coverage 64.46% (32304/50117)
Region Coverage 65.36% (16173/24746)
Branch Coverage 55.82% (8620/15442)

@Yukang-Lian
Copy link
Copy Markdown
Collaborator Author

run buildall

@doris-robot
Copy link
Copy Markdown

Cloud UT Coverage Report

Increment line coverage 75.78% (122/161) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 78.47% (1797/2290)
Line Coverage 64.16% (32264/50285)
Region Coverage 65.06% (16175/24863)
Branch Coverage 55.50% (8616/15524)

@hello-stephen
Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 48.98% (24/49) 🎉
Increment coverage report
Complete coverage report

@yiguolei
Copy link
Copy Markdown
Contributor

yiguolei commented Apr 1, 2026

skip buildall

@yiguolei yiguolei merged commit b387fb9 into apache:branch-4.1 Apr 1, 2026
27 of 30 checks passed
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.

5 participants