morningman opened a new pull request, #70579:
URL: https://github.com/apache/doris/pull/70579

   bp #70457
   
   ### Conflict resolution for branch-4.1
   
   #70457 does not apply cleanly here: it builds on launcher wrappers that 
master got from #64304, and it touches the Fluss fixture, which branch-4.1 does 
not have. What differs from the original:
   
   - **Fluss:** branch-4.1 has no Fluss docker environment, so 
`docker-compose/fluss/README.md` and `fluss.env.tpl` stay deleted, 
`fluss-network.sh` and `test/fluss-network-test.sh` are left out, and the Fluss 
sentence in `docker/thirdparties/README.md` and the Fluss case in 
`test/launcher-stop-test.sh` are dropped.
   - **`run-thirdparties-docker.sh`:** branch-4.1 had no `docker_cli` / 
`host_admin_cmd` wrappers, so besides the conflicted hunks, the 21 remaining 
`sudo docker` calls become `docker_cli` (as on master), the Lance jar download 
and the Iceberg data extraction drop `sudo`, and LakeSoul's `sudo rm -rf data` 
becomes `reset_data_dirs` plus `rmdir`, the pattern #70457 uses for Iceberg. 
`iceberg-rest` is added to `ALL_COMPONENTS`. Master-only code (MongoDB, Fluss, 
the Iceberg jar check) is not added. The launcher has no `sudo` left.
   - **`ranger_settings.env`:** takes #70457's overridable form. This also 
renames branch-4.1's `RANGER_SOLAR_PORT` to `RANGER_SOLR_PORT`, the name 
`ranger.yaml.tpl` already reads (master fixed it in #66770).
   - **`test/launcher-stop-test.sh`:** branch-4.1's `custom_settings.env` sets 
`CONTAINER_UID` unconditionally, so the test rewrites the copied file the way 
CI does.
   
   The other 25 files carry #70457's changes unchanged.
   
   ### Testing
   
   - `bash -n` passes on every `docker/thirdparties/*.sh`. 
`test/docker-command-test.sh`, `test/snapshot-hive-baseline-test.sh` and 
`test/launcher-stop-test.sh` pass locally (macOS, bash 5.3, GNU getopt as on 
Linux CI); the stop test fails when the `STOP` guard on Hive data preparation 
is removed.
   - Not run: the launcher against a real rootless Docker daemon. The External 
run on this PR is the end-to-end check; External's preflight on branch-4.1 
requires this pick, and #70578 makes `TeamCity/external` required here.
   
   ### AI Disclosure
   
   - Tool: Claude Code (Claude Opus 5.5)
   - Generated: the conflict resolution and the adaptations above, and this 
description
   - Human review: not stated
   


-- 
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]

Reply via email to