[branch-4.1](docker) pass env options through doris-compose up - #64623
Merged
hello-stephen merged 2 commits intoJul 22, 2026
Merged
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Author
|
Close per release triage request. Related Jira comments for this PR have been removed, and the affected Jira items will be re-triaged before any further action. |
Contributor
|
branch-4.1 已在 2026-07-22 的内部全量回归再次稳定复现该问题。
本 PR 的 |
Contributor
|
skip buildall |
wyxxxcat
approved these changes
Jul 22, 2026
|
|
||
| instance_id = getattr(args, 'instance_id', None) | ||
| cluster_snapshot = getattr(args, 'cluster_snapshot', '') | ||
| env = getattr(args, 'env', []) or [] |
Contributor
|
PR approved by anyone and no changes requested. |
yiguolei
approved these changes
Jul 22, 2026
github-actions
Bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
5 tasks
yiguolei
pushed a commit
that referenced
this pull request
Jul 23, 2026
### What problem does this PR solve? TeamCity S3 Docker build #203806 reran branch-4.1 after #64623 and exposed the next first error shared by all 192 failed suites: ```text NameError: name 'external_ms_cluster' is not defined ``` This is a partial-backport gap. branch-4.1 already contains the `--external-ms` argument and passes `external_ms_cluster` to `Cluster.new`, but missed the corresponding local-variable assignment from #57236. Jira: DORIS-26392 Build: http://172.20.48.17:8111/build/203806 Reference: #57236 ### What is changed? Initialize `external_ms_cluster` from `args.external_ms` before the cloud/non-cloud branch. This PR intentionally does not backport the full multi-cluster feature or add new validation behavior. It only restores the missing assignment while preserving the existing branch-4.1 behavior. ### Check List - [x] Diff against branch-4.1 is exactly one added line. - [x] `git diff --check` - [x] `python3 -m py_compile docker/runtime/doris-compose/command.py docker/runtime/doris-compose/cluster.py` - [x] AST check confirms the variable is bound before `Cluster.new` uses it. - [ ] After merge, rerun branch-4.1 Compile and S3 Docker; all #203806 occurrences must create their clusters and reach their own assertions.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Testing
Links