pingchunzhang opened a new pull request, #68618:
URL: https://github.com/apache/doris/pull/68618
### What problem does this PR solve?
Issue Number: None
Related PR: #68449
Problem Summary:
Backport #68449 (`50a39819e185f54fbb3a82e67182b1ec8f78433b`) to
`branch-4.1`. The changes stabilize regression clients and orchestration for
TLS/mTLS, Docker isolation, multi-cluster state cleanup, cloud
cache/compaction, asynchronous metadata visibility, and delete-bitmap
restart/concurrency tests. Doris Compose uses exact container-name matching and
retries concurrent removal races.
Resolved 27 conflict paths with these branch adaptations:
- Keep the `nereids_p0` suite paths, generated database names, planner
settings, existing SHOW columns and 4.1-only test logic.
- Preserve configured-master JDBC/HTTP endpoints in the
insert-visible-timeout suite, including mapped ports from #65340.
- Keep the routine-load WHERE expectation `(k00 = 8)`: 4.1's
`PlanUtils.ExpressionToExpr` stores unquoted slot labels, unlike master. Retain
the source topic fix, diagnostic fields and independent polling counters.
- Keep `nereids_p0/hbo` in the non-concurrent exclusions while excluding all
`cloud_p0` suites as intended by the source fix.
- Combine the shared TLS/compaction helpers with 4.1's existing framework
behavior; do not import unrelated scenarios present only in the source commit's
parent.
- Omit `test_partition_cloud_add_build_index_validation.groovy`: the
partition index-format rollout feature from #66475 and its required
properties/configuration are absent from 4.1.
- Reuse the original PR's result files without manually creating expected
output; retain the deterministic variant ordering fix.
The resulting backport changes 350 files; no FE implementation, protocol, or
storage-format change is added.
### Release note
None
### Check List (For Author)
- Test:
- [ ] Regression test on a running Doris cluster
- [ ] Unit Test
- [x] Manual test:
- `git diff --cached --check` and conflict-marker scan passed.
- All 340 changed existing Groovy files passed parsing through the
conversion phase with Groovy 4.0.19 / JDK 17. This is syntax validation, not
full framework compilation.
- Both changed Python files passed `py_compile`.
- `build-support/check-format.sh` passed with clang-format 16.0.6
(4,400 C/C++ files).
- Compared conflict resolutions with the source patch and branch-4.1
implementations, including RPC/debug-point dependencies and routine-load
expression serialization.
- Attempted `run-regression-test.sh --compile` with JDK 17; it
stopped because `thirdparty/installed/bin/thrift` is unavailable. BE
compilation, clang-tidy and live cluster regression remain for CI.
- Behavior changed: Yes. Regression framework/test behavior and Doris
Compose discovery match the applicable source fixes; BE additions are gated
debug points.
- Does this need documentation: No.
<details>
<summary>Backport self-review checkpoints</summary>
| Checkpoint | Conclusion |
| --- | --- |
| Goal and tests | Applicable source fixes preserved; syntax/static checks
pass, runtime checks await CI. |
| Scope | Source patch plus documented branch adaptations; unsupported
feature suite omitted. |
| Concurrency and locking | Existing production lock order retained;
debug-only post-calculation barrier releases the rowset lock before waiting.
Suite worker errors propagate to their owners. |
| Lifecycle | Source connection/process cleanup and shared-state restoration
retained. |
| Configuration | Existing TLS and debug configuration used; referenced
cloud sync settings exist in 4.1. |
| Compatibility | Target RPC/HTTP/debug APIs verified; branch endpoint
mappings and result schemas retained. No wire/storage format changes. |
| Parallel paths | Relevant plaintext/TLS and local/cloud helper paths
retained. |
| Conditional checks | Source bounded polling and negative assertions
retained; branch adaptations checked against implementation. |
| Test coverage | Source helper unit tests and regression coverage included;
no runtime pass claimed. |
| Expected results | Source result files reused; no hand-written golden
output. |
| Observability | Source timeout/last-state diagnostics and
token/tablet/transaction debug logs retained. |
| Persistence and failover | No production persistence or replay change. |
| Writes and atomicity | Production write behavior unchanged outside enabled
test debug points. |
| FE/BE propagation | Existing target sync-load RPC and metadata endpoints
support new helpers. |
| Performance | Production additions are gated debug checks; regression
polling is bounded. |
| Other findings | Focused framework/BE, TLS-suite and cloud-suite reviews
found no unresolved backport-specific blocker. |
</details>
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases and CI results
- [ ] Confirm document
- [ ] Add branch pick label
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
