This is an automated email from the ASF dual-hosted git repository.

liaoxin01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new ab044d69163 [fix](docker) Fix doris-compose up without env argument 
(#65142)
ab044d69163 is described below

commit ab044d691635ea5d1e27daf72ee42d795ef6ab52
Author: Yixuan Wang <[email protected]>
AuthorDate: Wed Jul 8 10:35:29 2026 +0800

    [fix](docker) Fix doris-compose up without env argument (#65142)
    
    Problem Summary: In 4.1.2-tmp-rc03 release regression, Docker Case and
    S3 Docker Case failed broadly during docker-compose cluster startup. The
    storage vault snapshot change reads `args.env` in `doris-compose.py up`
    to check `ENABLE_STORAGE_VAULT`, but the affected release branch can run
    with an argparse `Namespace` that does not define `env`. This causes
    `AttributeError: 'Namespace' object has no attribute 'env'` before the
    test cluster is created, blocking docker-based regression suites.
    
    This change reads the optional `env` argument with `getattr(args, 'env',
    None)` once and reuses that value for both `ENABLE_STORAGE_VAULT`
    parsing and `Cluster.new()`. When the argument is absent, the default
    behavior is unchanged: no extra environment variables are passed and
    storage vault remains disabled.
---
 docker/runtime/doris-compose/command.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/runtime/doris-compose/command.py 
b/docker/runtime/doris-compose/command.py
index d3cb0821b4a..afab4773fbb 100644
--- a/docker/runtime/doris-compose/command.py
+++ b/docker/runtime/doris-compose/command.py
@@ -698,14 +698,15 @@ class UpCommand(Command):
 
             instance_id = getattr(args, 'instance_id', None)
             cluster_snapshot = getattr(args, 'cluster_snapshot', '')
+            env = getattr(args, 'env', None)
             enable_storage_vault = CLUSTER.is_true(
-                CLUSTER.get_env_value(args.env, "ENABLE_STORAGE_VAULT"))
+                CLUSTER.get_env_value(env, "ENABLE_STORAGE_VAULT"))
 
             cluster = CLUSTER.Cluster.new(
                 args.NAME, args.IMAGE, args.cloud, args.root, args.fe_config,
                 args.be_config, args.ms_config, args.recycle_config,
                 args.remote_master_fe, args.local_network_ip, args.fe_follower,
-                args.be_disks if args.be_disks is not None else ["HDD=1"], 
args.be_cluster, args.reg_be, args.extra_hosts, args.env,
+                args.be_disks if args.be_disks is not None else ["HDD=1"], 
args.be_cluster, args.reg_be, args.extra_hosts, env,
                 args.coverage_dir, cloud_store_config, args.sql_mode_node_mgr,
                 args.be_metaservice_endpoint, args.be_cluster_id, args.tde_ak, 
args.tde_sk,
                 args.tde_aws_ak, args.tde_aws_sk, args.tde_aliyun_ak, 
args.tde_aliyun_sk,


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to