Skip to content

[feat](regression) Add dockers to manage multi docker clusters - #57236

Merged
dataroaring merged 2 commits into
apache:masterfrom
w41ter:snapshot/feat/regression_framework_multi_docker_clusters
Oct 22, 2025
Merged

[feat](regression) Add dockers to manage multi docker clusters#57236
dataroaring merged 2 commits into
apache:masterfrom
w41ter:snapshot/feat/regression_framework_multi_docker_clusters

Conversation

@w41ter

@w41terw41ter commented Oct 22, 2025

Copy link
Copy Markdown
Contributor

and support sharing MS between clusters.

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@Thearas

Thearas commented Oct 22, 2025

Copy link
Copy Markdown
Contributor

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?

@w41ter

w41ter commented Oct 22, 2025

Copy link
Copy Markdown
ContributorAuthor

run buildall

@github-actions

github-actionsBot commented Oct 22, 2025

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

gavinchou
gavinchou previously approved these changes Oct 22, 2025
View reviewed changes
@github-actions

github-actionsBot commented Oct 22, 2025

Copy link
Copy Markdown
Contributor

PR approved by at least one committer and no changes requested.

@github-actionsgithub-actionsBot added the approved Indicates a PR has been approved by one committer. label Oct 22, 2025
yujun777
yujun777 approved these changes Oct 22, 2025
View reviewed changes

@yujun777yujun777 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

deardeng
deardeng approved these changes Oct 22, 2025
View reviewed changes

@deardengdeardeng left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@w41ter

w41ter commented Oct 22, 2025

Copy link
Copy Markdown
ContributorAuthor

run buildall

@github-actionsgithub-actionsBot removed the approved Indicates a PR has been approved by one committer. label Oct 22, 2025
dataroaring
dataroaring approved these changes Oct 22, 2025
View reviewed changes

@dataroaringdataroaring left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actionsgithub-actionsBot added the approved Indicates a PR has been approved by one committer. label Oct 22, 2025
@github-actions

github-actionsBot commented Oct 22, 2025

Copy link
Copy Markdown
Contributor

PR approved by at least one committer and no changes requested.

@dataroaring
dataroaring merged commit c4193bd into apache:masterOct 22, 2025
27 checks passed
@w41ter
w41ter deleted the snapshot/feat/regression_framework_multi_docker_clusters branch October 23, 2025 02:23
dwdwqfwe pushed a commit to dwdwqfwe/doris that referenced this pull request Oct 24, 2025
@w41ter@dwdwqfwe
[feat](regression) Add dockers to manage multi docker clusters (apach…
28ef734
…e#57236)
and support sharing MS between clusters.
morrySnow pushed a commit to morrySnow/incubator-doris that referenced this pull request Mar 26, 2026
@catpineapple
pick: sync docker/runtime/ from upstream apache/doris master (apache#…
db6af27
…7561)
Cherry-pick all docker/runtime/ changes from apache/doris master that
are missing in branch-hotfix-selectdb-doris-3.1-hubspot.
Includes changes from PRs:
apache#42068apache#42208apache#42564apache#42605apache#43040apache#43085apache#43200apache#45503apache#45926apache#46387apache#47342apache#47837apache#48183apache#48839apache#48898apache#49343apache#49874apache#50247apache#50536apache#50604apache#50745apache#50922apache#51357apache#51693apache#54321apache#54392apache#54950apache#55299apache#55548apache#55615apache#55671apache#55824apache#56471apache#56757apache#56917apache#57113apache#57236apache#57345apache#57374apache#57695apache#58229apache#58565apache#58638apache#59039apache#59292apache#59480apache#59553apache#60060apache#60458
## Proposed changes
Issue Number: close #xxx
<!--Describe your changes.-->
Co-authored-by: catpineapple <catpineapple@users.noreply.github.com>
@wyxxxcatwyxxxcat mentioned this pull request Jul 23, 2026
Merged
5 tasks
yiguolei pushed a commit that referenced this pull request Jul 23, 2026
@hello-stephen
[branch-4.1][fix](docker) initialize external MS argument (#65926)
619ce84
### 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.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deardengdeardengdeardeng approved these changes
@Yukang-LianYukang-LianYukang-Lian approved these changes
@dataroaringdataroaringdataroaring approved these changes
@gavinchougavinchougavinchou left review comments
+1 more reviewer
@yujun777yujun777yujun777 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approvedIndicates a PR has been approved by one committer.clouddev/4.1.0-mergedreviewedsnapshot

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@w41ter@Thearas@deardeng@gavinchou@yujun777@Yukang-Lian@dataroaring@wyxxxcat